aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <anders@erlang.org>2014-12-02 11:13:14 +0100
committerAnders Svensson <anders@erlang.org>2014-12-02 11:13:14 +0100
commit110ffa446c7c0e849a96b7706e0e5db759bea8bc (patch)
tree430f52a729c7ab45ddb70105a6d5d92f7fef5ba9
parent506a78a32112e64d8cc328e461fc588a07c3b8b4 (diff)
parent6740f93fac65a2e2b8079a6f1a6b74ae847766d9 (diff)
downloadotp-110ffa446c7c0e849a96b7706e0e5db759bea8bc.tar.gz
otp-110ffa446c7c0e849a96b7706e0e5db759bea8bc.tar.bz2
otp-110ffa446c7c0e849a96b7706e0e5db759bea8bc.zip
Merge branch 'maint'
-rw-r--r--lib/diameter/src/diameter.appup.src12
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 40580e3ce6..881d25b5fb 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -55,7 +55,11 @@
{load_module, diameter_gen_base_accounting},
{load_module, diameter_gen_relay},
{load_module, diameter_traffic},
- {load_module, diameter_peer_fsm}]}
+ {load_module, diameter_peer_fsm}]},
+ {"1.7.1", [{load_module, diameter_traffic}, %% 17.3
+ {load_module, diameter_watchdog},
+ {load_module, diameter_peer_fsm},
+ {load_module, diameter_service}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -93,6 +97,10 @@
{load_module, diameter_gen_acct_rfc6733},
{load_module, diameter_gen_base_rfc6733},
{load_module, diameter_codec},
- {load_module, diameter_service}]}
+ {load_module, diameter_service}]},
+ {"1.7.1", [{load_module, diameter_service},
+ {load_module, diameter_peer_fsm},
+ {load_module, diameter_watchdog},
+ {load_module, diameter_traffic}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 4e54e4eafc..587ae08b3d 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,5 +18,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.7.1
+DIAMETER_VSN = 1.8
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)