diff options
| author | Anders Svensson <anders@erlang.org> | 2017-09-18 15:21:01 +0200 |
|---|---|---|
| committer | Anders Svensson <anders@erlang.org> | 2017-09-18 15:21:01 +0200 |
| commit | c504153dbb07bf756621cd21401e18d9055578ad (patch) | |
| tree | d63b56bba18a3a629184e92e9eac2f85212f2174 | |
| parent | 445ed7f183e40186f44b0af3c4b19bd65262c9a0 (diff) | |
| parent | 9cc95f49e6f106236a6ff3cbd184055d1dfd2fd4 (diff) | |
| download | erlang-c504153dbb07bf756621cd21401e18d9055578ad.tar.gz | |
Merge branch 'anders/diameter/20.1/OTP-14561' into maint
* anders/diameter/20.1/OTP-14561:
Update appup and version for 20.1
| -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 07d0389bfd..7566cf25c3 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -52,7 +52,8 @@ {"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.2", [{restart_application, diameter}]} %% 19.3 + {"1.12.2", [{restart_application, diameter}]}, %% 19.3 + {"2.0", [{restart_application, diameter}]} %% 20.0 ], [ {"0.9", [{restart_application, diameter}]}, @@ -86,6 +87,7 @@ {"1.11.2", [{restart_application, diameter}]}, {"1.12", [{restart_application, diameter}]}, {"1.12.1", [{restart_application, diameter}]}, - {"1.12.2", [{restart_application, diameter}]} + {"1.12.2", [{restart_application, diameter}]}, + {"2.0", [{restart_application, diameter}]} ] }. diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index 4801f542fb..e6dfddb5b2 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -17,5 +17,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 2.0 +DIAMETER_VSN = 2.1 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |