aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2014-09-09 18:32:52 +0200
committerAnders Svensson <[email protected]>2014-09-09 18:32:52 +0200
commit709a304876b53ed941a45aed48b43744818e1224 (patch)
tree20f1ace220177dee6aed181b475570836654313a
parentde0c4b164fce97b2bed420a714537e7b1662f073 (diff)
parent156b9c67d9d0fc7e4b21e5b7dc4b6f36b05775cb (diff)
downloadotp-709a304876b53ed941a45aed48b43744818e1224.tar.gz
otp-709a304876b53ed941a45aed48b43744818e1224.tar.bz2
otp-709a304876b53ed941a45aed48b43744818e1224.zip
Merge branch 'anders/diameter/17.3_release/OTP-12093' into maint
* anders/diameter/17.3_release/OTP-12093: vsn -> 1.7.1 Update appup for OTP-12094 Update appup for OTP-12080 Update appup for OTP-12069
-rw-r--r--lib/diameter/src/diameter.appup.src22
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 21 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 3b6e259f5a..40580e3ce6 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -46,7 +46,16 @@
{load_module, diameter_gen_base_accounting},
{load_module, diameter_gen_relay},
{load_module, diameter_codec},
- {load_module, diameter_sctp}]}
+ {load_module, diameter_sctp}]},
+ {"1.7", [{load_module, diameter_service}, %% 17.1
+ {load_module, diameter_codec},
+ {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_traffic},
+ {load_module, diameter_peer_fsm}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -75,6 +84,15 @@
{load_module, diameter_peer_fsm},
{load_module, diameter_watchdog},
{load_module, diameter_traffic},
- {load_module, diameter_lib}]}
+ {load_module, diameter_lib}]},
+ {"1.7", [{load_module, diameter_peer_fsm},
+ {load_module, diameter_traffic},
+ {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_codec},
+ {load_module, diameter_service}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 560c2aed50..4e54e4eafc 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,5 +18,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.7
+DIAMETER_VSN = 1.7.1
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)