aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2016-03-08 15:45:04 +0100
committerAnders Svensson <[email protected]>2016-03-08 15:45:04 +0100
commitab507dcee5917f147e1c4c307a29ad9508ccc85f (patch)
tree335a2de8d7dedbe7ac3e2e63d518912113cb7e34 /lib/diameter
parent98518999e43921de723f9057e8405c889d020500 (diff)
parent2850f5f8dc46c804abff506f7fad8dc5e70229b2 (diff)
downloadotp-ab507dcee5917f147e1c4c307a29ad9508ccc85f.tar.gz
otp-ab507dcee5917f147e1c4c307a29ad9508ccc85f.tar.bz2
otp-ab507dcee5917f147e1c4c307a29ad9508ccc85f.zip
Merge branch 'maint'
Diffstat (limited to 'lib/diameter')
-rw-r--r--lib/diameter/src/diameter.appup.src44
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 9 insertions, 37 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index ba0e79907c..a3e21db012 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -46,24 +46,11 @@
{"1.9.2.1", [{restart_application, diameter}]}, %% 17.5.6.3
{"1.9.2.2", [{restart_application, diameter}]}, %% 17.5.6.7
{"1.9.2.3", [{restart_application, diameter}]}, %% 17.5.6.8
- {"1.10", [{load_module, diameter_codec}, %% 18.0
- {load_module, diameter_peer_fsm},
- {load_module, diameter_watchdog},
- {load_module, diameter_stats},
- {load_module, diameter_config},
- {load_module, diameter_lib},
- {load_module, diameter_peer},
- {load_module, diameter_reg},
- {load_module, diameter_traffic},
- {load_module, diameter_service},
- {load_module, diameter_sync},
- {load_module, diameter},
- {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}]},
- {"1.11", [{load_module, diameter_traffic}]} %% 18.1
+ {"1.10", [{restart_application, diameter}]}, %% 18.0
+ {"1.11", [{load_module, diameter_traffic}, %% 18.1
+ {update, diameter_service, {advanced, []}}]},
+ {"1.11.1", [{load_module, diameter_traffic}, %% 18.2
+ {update, diameter_service, {advanced, []}}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -91,23 +78,8 @@
{"1.9.2.1", [{restart_application, diameter}]},
{"1.9.2.2", [{restart_application, diameter}]},
{"1.9.2.3", [{restart_application, diameter}]},
- {"1.10", [{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},
- {load_module, diameter_sync},
- {load_module, diameter_service},
- {load_module, diameter_traffic},
- {load_module, diameter_reg},
- {load_module, diameter_peer},
- {load_module, diameter_lib},
- {load_module, diameter_config},
- {load_module, diameter_stats},
- {load_module, diameter_watchdog},
- {load_module, diameter_peer_fsm},
- {load_module, diameter_codec}]},
- {"1.11", [{load_module, diameter_traffic}]}
+ {"1.10", [{restart_application, diameter}]},
+ {"1.11", [{restart_application, diameter}]},
+ {"1.11.1", [{restart_application, diameter}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 7ac4a7adfb..836def8447 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.11.1
+DIAMETER_VSN = 1.11.2
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)