aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-01-26 10:58:19 +0100
committerErlang/OTP <[email protected]>2016-01-26 10:58:19 +0100
commitcb4cb6d2d5540b49e54d3a53de2e1069859a8b5c (patch)
tree33de38bacfe51304cd3ba60fea4bd39d78b7f8db /lib/diameter
parenteba0f274d44ac354a7ce96240c651d08a2342dd5 (diff)
parent0967c22be52ee5c7dace7adb102b9b8635b2913b (diff)
downloadotp-cb4cb6d2d5540b49e54d3a53de2e1069859a8b5c.tar.gz
otp-cb4cb6d2d5540b49e54d3a53de2e1069859a8b5c.tar.bz2
otp-cb4cb6d2d5540b49e54d3a53de2e1069859a8b5c.zip
Merge branch 'anders/diameter/17.5.6.8/OTP-13212' into maint-17
* anders/diameter/17.5.6.8/OTP-13212: vsn -> 1.9.2.3 Update appup for 17.5.6.8
Diffstat (limited to 'lib/diameter')
-rw-r--r--lib/diameter/src/diameter.appup.src68
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 9 insertions, 61 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 7d66557162..e030b3c72b 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -35,41 +35,15 @@
{"1.4.3", [{restart_application, diameter}]}, %% R16B02
{"1.4.4", [{restart_application, diameter}]},
{"1.5", [{restart_application, diameter}]}, %% R16B03
+ {"1.5.1", [{restart_application, diameter}]},
{"1.6", [{restart_application, diameter}]}, %% 17.0
{<<"^1\\.(7(\\.1)?|8)$">>, %% 17.[134]
[{restart_application, diameter}]},
{<<"^1.9(\\.1)?$">>, %% 17.5(.3)?
[{restart_application, diameter}]},
- {"1.9.2", [{load_module, diameter_peer_fsm}, %% 17.5.5
- {load_module, diameter_watchdog},
- {load_module, diameter_stats},
- {load_module, diameter_codec},
- {load_module, diameter_lib},
- {load_module, diameter_peer},
- {load_module, diameter_reg},
- {load_module, diameter_service},
- {load_module, diameter_session},
- {load_module, diameter_sync},
- {load_module, diameter_traffic},
- {load_module, diameter_sctp},
- {load_module, diameter_gen_base_rfc6733},
- {load_module, diameter_gen_acct_rfc6733},
- {load_module, diameter_gen_base_rfc3588},
- {load_module, diameter_gen_base_accounting},
- {load_module, diameter_gen_relay},
- {load_module, diameter},
- {load_module, diameter_config}]},
- {"1.9.2.1", [{load_module, diameter_watchdog}, %% 17.5.6.3
- {load_module, diameter_codec},
- {load_module, diameter_traffic},
- {load_module, diameter_service},
- {load_module, diameter_gen_base_rfc6733},
- {load_module, diameter_gen_acct_rfc6733},
- {load_module, diameter_gen_base_rfc3588},
- {load_module, diameter_gen_base_accounting},
- {load_module, diameter_gen_relay},
- {load_module, diameter,
- {load_module, diameter_config}}]}
+ {"1.9.2", [{restart_application, diameter}]}, %% 17.5.5
+ {"1.9.2.1", [{restart_application, diameter}]}, %% 17.5.6.3
+ {"1.9.2.2", [{update, diameter_service, {advanced, []}}]} %% 17.5.6.7
],
[
{"0.9", [{restart_application, diameter}]},
@@ -87,40 +61,14 @@
{"1.4.3", [{restart_application, diameter}]},
{"1.4.4", [{restart_application, diameter}]},
{"1.5", [{restart_application, diameter}]},
+ {"1.5.1", [{restart_application, diameter}]},
{"1.6", [{restart_application, diameter}]},
{<<"^1\\.(7(\\.1)?|8)$">>,
[{restart_application, diameter}]},
{<<"^1.9(\\.1)?$">>,
[{restart_application, diameter}]},
- {"1.9.2", [{load_module, diameter_config},
- {load_module, diameter},
- {load_module, diameter_gen_relay},
- {load_module, diameter_gen_base_accounting},
- {load_module, diameter_gen_base_rfc3588},
- {load_module, diameter_gen_acct_rfc6733},
- {load_module, diameter_gen_base_rfc6733},
- {load_module, diameter_sctp},
- {load_module, diameter_traffic},
- {load_module, diameter_sync},
- {load_module, diameter_session},
- {load_module, diameter_service},
- {load_module, diameter_reg},
- {load_module, diameter_peer},
- {load_module, diameter_lib},
- {load_module, diameter_codec},
- {load_module, diameter_stats},
- {load_module, diameter_watchdog},
- {load_module, diameter_peer_fsm}]},
- {"1.9.2.1", [{load_module, diameter_config},
- {load_module, diameter},
- {load_module, diameter_gen_relay},
- {load_module, diameter_gen_base_accounting},
- {load_module, diameter_gen_base_rfc3588},
- {load_module, diameter_gen_acct_rfc6733},
- {load_module, diameter_gen_base_rfc6733},
- {load_module, diameter_service},
- {load_module, diameter_traffic},
- {load_module, diameter_codec},
- {load_module, diameter_watchdog}]}
+ {"1.9.2", [{restart_application, diameter}]},
+ {"1.9.2.1", [{restart_application, diameter}]},
+ {"1.9.2.2", [{restart_application, diameter}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 18b77e243f..851ae5c3cf 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -16,5 +16,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.9.2.2
+DIAMETER_VSN = 1.9.2.3
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)