aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-06-14 09:30:41 +0200
committerAnders Svensson <[email protected]>2017-06-14 09:30:41 +0200
commitf7c9c43c08fd46d89f2a5bf1d055f431dd3812dc (patch)
tree7c449de7dba0652ff9f886a16a1e1bff609b8e13
parent5ef0555f4a696e6cc5a927bc6d8f469a725c0ef1 (diff)
parent8fcae2614e41c5745c41dc2e408c1a8f172cbd3b (diff)
downloadotp-f7c9c43c08fd46d89f2a5bf1d055f431dd3812dc.tar.gz
otp-f7c9c43c08fd46d89f2a5bf1d055f431dd3812dc.tar.bz2
otp-f7c9c43c08fd46d89f2a5bf1d055f431dd3812dc.zip
Merge branch 'anders/diameter/20.0/OTP-14398'
* anders/diameter/20.0/OTP-14398: vsn -> 2.0 Update appup for 20.0
-rw-r--r--lib/diameter/src/diameter.appup.src6
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index eb5a5a44f3..07d0389bfd 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -51,7 +51,8 @@
{"1.11.1", [{restart_application, diameter}]}, %% 18.2
{"1.11.2", [{restart_application, diameter}]}, %% 18.3
{"1.12", [{restart_application, diameter}]}, %% 19.0
- {"1.12.1", [{restart_application, diameter}]} %% 19.1
+ {"1.12.1", [{restart_application, diameter}]}, %% 19.1
+ {"1.12.2", [{restart_application, diameter}]} %% 19.3
],
[
{"0.9", [{restart_application, diameter}]},
@@ -84,6 +85,7 @@
{"1.11.1", [{restart_application, diameter}]},
{"1.11.2", [{restart_application, diameter}]},
{"1.12", [{restart_application, diameter}]},
- {"1.12.1", [{restart_application, diameter}]}
+ {"1.12.1", [{restart_application, diameter}]},
+ {"1.12.2", [{restart_application, diameter}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 94d9d72a48..4801f542fb 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.12.2
+DIAMETER_VSN = 2.0
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)