diff options
| author | Anders Svensson <[email protected]> | 2015-12-09 15:12:01 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-12-09 15:12:01 +0100 |
| commit | 48ed10971c7d30722ead3388208818e12b4797b5 (patch) | |
| tree | f6146d2462038eb194cc811d48a92cb4e5e1c18c | |
| parent | 0dc640a73faba6e3f00d45e6b2739ce055d977cd (diff) | |
| parent | 34adc77f01e666eaea5e45b3857b7791626e81ac (diff) | |
| download | otp-48ed10971c7d30722ead3388208818e12b4797b5.tar.gz otp-48ed10971c7d30722ead3388208818e12b4797b5.tar.bz2 otp-48ed10971c7d30722ead3388208818e12b4797b5.zip | |
Merge branch 'anders/diameter/18.2/OTP-13180' into maint
* anders/diameter/18.2/OTP-13180:
vsn -> 1.11.1
Update appup for 18.2
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 6 | ||||
| -rw-r--r-- | lib/diameter/vsn.mk | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index b77043d983..ddde648e08 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -60,7 +60,8 @@ {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_gen_relay}]}, + {"1.11", [{load_module, diameter_traffic}]} %% 18.1 ], [ {"0.9", [{restart_application, diameter}]}, @@ -102,6 +103,7 @@ {load_module, diameter_stats}, {load_module, diameter_watchdog}, {load_module, diameter_peer_fsm}, - {load_module, diameter_codec}]} + {load_module, diameter_codec}]}, + {"1.11", [{load_module, diameter_traffic}]} ] }. diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index 041d21b261..7ac4a7adfb 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -17,5 +17,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 1.11 +DIAMETER_VSN = 1.11.1 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |