aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2015-08-13 12:34:04 +0200
committerErlang/OTP <otp@erlang.org>2015-08-13 12:34:04 +0200
commit3a136b9ceebbb2450774641af2c08314b9669985 (patch)
tree49a486745259e0d46883f436a973425cf70e106e
parent2c7132e3f6dc670a177aac804fe12702dbc9ed7d (diff)
parentd6e8e9186996ac75ffa6f00a50f407d94b0e8181 (diff)
downloadotp-3a136b9ceebbb2450774641af2c08314b9669985.tar.gz
otp-3a136b9ceebbb2450774641af2c08314b9669985.tar.bz2
otp-3a136b9ceebbb2450774641af2c08314b9669985.zip
Merge branch 'anders/diameter/17.5.6.3/OTP-12927' into maint-17
* anders/diameter/17.5.6.3/OTP-12927: vsn -> 1.9.2.1 Update appup for 17.5.6.3
-rw-r--r--lib/diameter/src/diameter.appup.src96
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 51 insertions, 47 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index b89859ed24..adb3f960ff 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -36,43 +36,45 @@
{"1.4.4", [{restart_application, diameter}]},
{"1.5", [{restart_application, diameter}]}, %% R16B03
{"1.6", [{restart_application, diameter}]}, %% 17.0
- {"1.7", [{restart_application, diameter}]}, %% 17.[12]
- {<<"^1\\.(7\\.1|8)$">>, %% 17.[34]
- [{load_module, diameter_lib},
- {load_module, diameter_peer},
- {load_module, diameter_reg},
- {load_module, diameter_session},
- {load_module, diameter_stats},
- {load_module, diameter_sync},
- {load_module, diameter_capx},
- {load_module, diameter_codec},
- {load_module, diameter_types},
+ {<<"1\\.(7(\\.1)?|8)$">>, %% 17.[134]
+ [{restart_application, diameter}]},
+ {<<"^1.9(\\.1)?$">>, %% 17.5(.3)?
+ [{load_module, diameter_codec},
{load_module, diameter_traffic},
- {load_module, diameter_service},
+ {load_module, diameter_sctp},
{load_module, diameter_peer_fsm},
{load_module, diameter_watchdog},
- {load_module, diameter_tcp},
- {load_module, diameter_sctp},
+ {load_module, diameter_stats},
{load_module, diameter_config},
- {load_module, diameter},
+ {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_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},
- {update, diameter_transport_sup, supervisor},
- {update, diameter_service_sup, supervisor},
- {update, diameter_sup, supervisor}]},
- {"1.9", [{load_module, diameter_codec}, %% 17.5
+ {load_module, diameter_gen_relay}]},
+ {"1.9.2", [{load_module, diameter_peer_fsm}, %% 17.5.5
+ {load_module, diameter_watchdog},
+ {load_module, diameter_stats},
+ {load_module, diameter_config},
+ {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}]},
- {"1.9.1", [{load_module, diameter_traffic}, %% 17.5.3
- {load_module, diameter_sctp}]}
+ {load_module, diameter_gen_relay}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -91,42 +93,44 @@
{"1.4.4", [{restart_application, diameter}]},
{"1.5", [{restart_application, diameter}]},
{"1.6", [{restart_application, diameter}]},
- {"1.7", [{restart_application, diameter}]},
- {<<"^1\\.(7\\.1|8)$">>,
- [{update, diameter_sup, supervisor},
- {update, diameter_service_sup, supervisor},
- {update, diameter_transport_sup, supervisor},
- {load_module, diameter_gen_relay},
+ {<<"1\\.(7(\\.1)?|8)$">>,
+ [{restart_application, diameter}]},
+ {<<"^1.9(\\.1)?$">>,
+ [{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},
- {load_module, diameter_config},
- {load_module, diameter_sctp},
- {load_module, diameter_tcp},
- {load_module, diameter_watchdog},
- {load_module, diameter_peer_fsm},
- {load_module, diameter_service},
- {load_module, diameter_traffic},
- {load_module, diameter_types},
- {load_module, diameter_codec},
- {load_module, diameter_capx},
{load_module, diameter_sync},
- {load_module, diameter_stats},
{load_module, diameter_session},
+ {load_module, diameter_service},
{load_module, diameter_reg},
{load_module, diameter_peer},
- {load_module, diameter_lib}]},
- {"1.9", [{load_module, diameter_gen_relay},
+ {load_module, diameter_lib},
+ {load_module, diameter_config},
+ {load_module, diameter_stats},
+ {load_module, diameter_watchdog},
+ {load_module, diameter_peer_fsm},
+ {load_module, diameter_sctp},
+ {load_module, diameter_traffic},
+ {load_module, diameter_codec}]},
+ {"1.9.2", [{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_codec}]},
- {"1.9.1", [{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_config},
+ {load_module, diameter_stats},
+ {load_module, diameter_watchdog},
+ {load_module, diameter_peer_fsm}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index c278e74dca..a16b8d712c 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -16,5 +16,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.9.2
+DIAMETER_VSN = 1.9.2.1
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)