diff options
| author | Anders Svensson <[email protected]> | 2017-03-08 12:31:31 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-03-08 12:31:31 +0100 |
| commit | 5f73a469eb3cde2095b573ef9eed7068c425fcd2 (patch) | |
| tree | 496b6cc7949a16990e42b49683240e8d39453607 | |
| parent | d439bbc28969339380239f903e272da9b650f2d0 (diff) | |
| parent | 7336ae05a17a284063db69e67159356f7190ec66 (diff) | |
| download | otp-5f73a469eb3cde2095b573ef9eed7068c425fcd2.tar.gz otp-5f73a469eb3cde2095b573ef9eed7068c425fcd2.tar.bz2 otp-5f73a469eb3cde2095b573ef9eed7068c425fcd2.zip | |
Merge branch 'anders/diameter/19.3/OTP-14252' into maint
* anders/diameter/19.3/OTP-14252:
vsn -> 1.12.2
Update appup for 19.3
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 14 | ||||
| -rw-r--r-- | lib/diameter/vsn.mk | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index b1b8e38d39..eb5a5a44f3 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2016. All Rights Reserved. +%% Copyright Ericsson AB 2010-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -50,10 +50,8 @@ {"1.11", [{restart_application, diameter}]}, %% 18.1 {"1.11.1", [{restart_application, diameter}]}, %% 18.2 {"1.11.2", [{restart_application, diameter}]}, %% 18.3 - {"1.12", [{load_module, diameter_lib}, %% 19.0 - {load_module, diameter_traffic}, - {load_module, diameter_tcp}, - {load_module, diameter_sctp}]} + {"1.12", [{restart_application, diameter}]}, %% 19.0 + {"1.12.1", [{restart_application, diameter}]} %% 19.1 ], [ {"0.9", [{restart_application, diameter}]}, @@ -85,9 +83,7 @@ {"1.11", [{restart_application, diameter}]}, {"1.11.1", [{restart_application, diameter}]}, {"1.11.2", [{restart_application, diameter}]}, - {"1.12", [{load_module, diameter_sctp}, - {load_module, diameter_tcp}, - {load_module, diameter_traffic}, - {load_module, diameter_lib}]} + {"1.12", [{restart_application, diameter}]}, + {"1.12.1", [{restart_application, diameter}]} ] }. diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index 23219950bb..94d9d72a48 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -1,6 +1,6 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2016. All Rights Reserved. +# Copyright Ericsson AB 2010-2017. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,5 +17,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 1.12.1 +DIAMETER_VSN = 1.12.2 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |