diff options
| author | Anders Svensson <[email protected]> | 2013-03-19 13:17:30 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-19 13:17:30 +0100 |
| commit | 53375f432c3ba5aa5a03bcbd2cb89caba6754113 (patch) | |
| tree | 5fdb22d696d04821b296bd4da2aef8019a4dbaf7 /lib/diameter/src/base/diameter.appup.src | |
| parent | 77c9f844f137deec2d49bd6c28ec03bce97d34df (diff) | |
| parent | da15b3c5fdc9ff96b8d02f4620c879418648d45c (diff) | |
| download | otp-53375f432c3ba5aa5a03bcbd2cb89caba6754113.tar.gz otp-53375f432c3ba5aa5a03bcbd2cb89caba6754113.tar.bz2 otp-53375f432c3ba5aa5a03bcbd2cb89caba6754113.zip | |
Merge branch 'anders/diameter/reopen_abuse/OTP-10898' into maint-r16
* anders/diameter/reopen_abuse/OTP-10898:
Update appup
Tweak okay -> suspect config
Add testcases for watchdog_config
Rework watchdog suite to remove most timing dependencies
Rework stats to avoid concurrent read and write
Minor spec fix
Add transport_opt() watchdog_config
Diffstat (limited to 'lib/diameter/src/base/diameter.appup.src')
| -rw-r--r-- | lib/diameter/src/base/diameter.appup.src | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src index 2ce89579ff..c3c7fe9a38 100644 --- a/lib/diameter/src/base/diameter.appup.src +++ b/lib/diameter/src/base/diameter.appup.src @@ -28,7 +28,12 @@ {"1.2.1", [{restart_application, diameter}]}, {"1.3", [{restart_application, diameter}]}, %% R15B03 {"1.3.1", [{restart_application, diameter}]}, - {"1.4", [{restart_application, diameter}]} %% R16A + {"1.4", [{restart_application, diameter}]}, %% R16A + {"1.4.1", [{load_module, diameter_reg}, %% R16B + {load_module, diameter_stats}, + {load_module, diameter_service}, + {load_module, diameter_watchdog}, + {load_module, diameter}]} ], [ {"0.9", [{restart_application, diameter}]}, @@ -39,6 +44,7 @@ {"1.2.1", [{restart_application, diameter}]}, {"1.3", [{restart_application, diameter}]}, {"1.3.1", [{restart_application, diameter}]}, - {"1.4", [{restart_application, diameter}]} + {"1.4", [{restart_application, diameter}]}, + {"1.4.1", [{restart_application, diameter}]} ] }. |