aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-03-10 13:10:34 +0100
committerErlang/OTP <[email protected]>2016-03-10 13:10:34 +0100
commit8d427543af1f8b88dbece2e7f131f7b26f2f3bba (patch)
treede577b0a4eddc62099e6faa446dc87af65377dcb /lib/diameter
parentcd4cfd29f4f59ffc45135653b595adea357b721e (diff)
parent2d0815f92c022ef1843d201aaf97ef1a5ed377a1 (diff)
downloadotp-8d427543af1f8b88dbece2e7f131f7b26f2f3bba.tar.gz
otp-8d427543af1f8b88dbece2e7f131f7b26f2f3bba.tar.bz2
otp-8d427543af1f8b88dbece2e7f131f7b26f2f3bba.zip
Merge branch 'anders/diameter/17.5.6.9/OTP-13385' into maint-17
* anders/diameter/17.5.6.9/OTP-13385: vsn -> 1.9.2.4 Update appup for 17.5.6.9
Diffstat (limited to 'lib/diameter')
-rw-r--r--lib/diameter/src/diameter.appup.src8
-rw-r--r--lib/diameter/vsn.mk4
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index e030b3c72b..2c91bb38b4 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -43,7 +43,9 @@
[{restart_application, diameter}]},
{"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
+ {"1.9.2.2", [{restart_application, diameter}]}, %% 17.5.6.7
+ {"1.9.2.3", [{load_module, diameter_traffic}, %% 17.5.6.8
+ {load_module, diameter_service}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -69,6 +71,8 @@
[{restart_application, diameter}]},
{"1.9.2", [{restart_application, diameter}]},
{"1.9.2.1", [{restart_application, diameter}]},
- {"1.9.2.2", [{restart_application, diameter}]}
+ {"1.9.2.2", [{restart_application, diameter}]},
+ {"1.9.2.3", [{load_module, diameter_service},
+ {load_module, diameter_traffic}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 851ae5c3cf..24107a5bdc 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -1,6 +1,6 @@
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2010-2015. All Rights Reserved.
+# Copyright Ericsson AB 2010-2016. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
@@ -16,5 +16,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.9.2.3
+DIAMETER_VSN = 1.9.2.4
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)