aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-12-09 14:44:35 +0100
committerErlang/OTP <[email protected]>2015-12-09 14:44:35 +0100
commit51e745bd223453c1144259af7e2bbc63a97e76ed (patch)
treee1f24471f0702e68ed866bce2c8d7713bc3bfc0e
parentda85a18a07d97594cce9162e2487b4ced55211ad (diff)
parentd25d0787413eb403bc11e770dbf17416bd251b08 (diff)
downloadotp-51e745bd223453c1144259af7e2bbc63a97e76ed.tar.gz
otp-51e745bd223453c1144259af7e2bbc63a97e76ed.tar.bz2
otp-51e745bd223453c1144259af7e2bbc63a97e76ed.zip
Merge branch 'anders/diameter/patch/OTP-13183' into maint-r16
* anders/diameter/patch/OTP-13183: vsn -> 1.5.1 Update appup for diameter 1.5.1
-rw-r--r--lib/diameter/src/diameter.appup.src13
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index c7ae8a2828..30c923a869 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -36,11 +36,13 @@
{load_module, diameter_config},
{load_module, diameter_capx},
{load_module, diameter_service},
+ {load_module, diameter_traffic},
{load_module, diameter_peer_fsm},
{load_module, diameter_watchdog},
{load_module, diameter}]},
{"1.4.3", [{load_module, diameter_capx}, %% R16B02
{load_module, diameter_service},
+ {load_module, diameter_traffic},
{load_module, diameter_watchdog},
{load_module, diameter_codec},
{load_module, diameter_types},
@@ -48,9 +50,12 @@
{load_module, diameter}]},
{"1.4.4", [{load_module, diameter_capx},
{load_module, diameter_service},
+ {load_module, diameter_traffic},
{load_module, diameter_watchdog},
{load_module, diameter_config},
- {load_module, diameter}]}
+ {load_module, diameter}]},
+ {"1.5", [{load_module, diameter_service}, %% R16B03
+ {load_module, diameter_traffic}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -68,14 +73,18 @@
{"1.4.3", [{load_module, diameter_types},
{load_module, diameter_config},
{load_module, diameter_codec},
+ {load_module, diameter_traffic},
{load_module, diameter_service},
{load_module, diameter_watchdog},
{load_module, diameter_capx},
{load_module, diameter}]},
{"1.4.4", [{load_module, diameter_capx},
{load_module, diameter_config},
+ {load_module, diameter_traffic},
{load_module, diameter_service},
{load_module, diameter_watchdog},
- {load_module, diameter}]}
+ {load_module, diameter}]},
+ {"1.5", [{load_module, diameter_traffic},
+ {load_module, diameter_service}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 9fda067f2b..8ca8dc4b45 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,5 +18,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.5
+DIAMETER_VSN = 1.5.1
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)