diff options
| author | Anders Svensson <[email protected]> | 2014-12-02 11:13:02 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-12-02 11:13:02 +0100 |
| commit | 6740f93fac65a2e2b8079a6f1a6b74ae847766d9 (patch) | |
| tree | 90ae6d1e1480f07e125f5071bd3273def4463c67 | |
| parent | 6852931e4460ad44aaa8d97bafdb4df3b2a5fee2 (diff) | |
| parent | 69e3659e084a54ff6bbbd72556bc31eb26ebae60 (diff) | |
| download | otp-6740f93fac65a2e2b8079a6f1a6b74ae847766d9.tar.gz otp-6740f93fac65a2e2b8079a6f1a6b74ae847766d9.tar.bz2 otp-6740f93fac65a2e2b8079a6f1a6b74ae847766d9.zip | |
Merge branch 'anders/diameter/17.4_release/OTP-12343' into maint
* anders/diameter/17.4_release/OTP-12343:
vsn -> 1.8
Update appup for 17.4
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 12 | ||||
| -rw-r--r-- | lib/diameter/vsn.mk | 2 |
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) |