aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-10-25 08:07:41 +0200
committerErlang/OTP <[email protected]>2017-10-25 08:07:41 +0200
commit220858e70fdb0a03ee6d92bef97d749f71a6deca (patch)
tree194c797439df38fc2b2ca32a5fcb0129bee5a9ea /lib
parentac52a2e341f73ae26b03947cf18a7e7e0f396917 (diff)
parent67f7217427d2465eb72e5cd61a6fb1ff8dc55f14 (diff)
downloadotp-220858e70fdb0a03ee6d92bef97d749f71a6deca.tar.gz
otp-220858e70fdb0a03ee6d92bef97d749f71a6deca.tar.bz2
otp-220858e70fdb0a03ee6d92bef97d749f71a6deca.zip
Merge branch 'anders/diameter/decode/OTP-14684' into maint-20
* anders/diameter/decode/OTP-14684: vsn -> 2.1.2 Update appup for ERIERL-14684
Diffstat (limited to 'lib')
-rw-r--r--lib/diameter/src/diameter.appup.src7
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index c2198de9ea..d0e58e8410 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -54,7 +54,9 @@
{"1.12.1", [{restart_application, diameter}]}, %% 19.1
{"1.12.2", [{restart_application, diameter}]}, %% 19.3
{"2.0", [{restart_application, diameter}]}, %% 20.0
- {"2.1", [{update, diameter_reg, {advanced, "2.1"}}]} %% 20.1
+ {"2.1", [{load_module, diameter_gen}, %% 20.1
+ {update, diameter_reg, {advanced, "2.1"}}]},
+ {"2.1.1", [{load_module, diameter_gen}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -90,6 +92,7 @@
{"1.12.1", [{restart_application, diameter}]},
{"1.12.2", [{restart_application, diameter}]},
{"2.0", [{restart_application, diameter}]},
- {"2.1", [{restart_application, diameter}]}
+ {"2.1", [{restart_application, diameter}]},
+ {"2.1.1", [{load_module, diameter_gen}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index f73f68da0b..bfb260ed8f 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 2.1.1
+DIAMETER_VSN = 2.1.2
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)