diff options
| author | Anders Svensson <[email protected]> | 2018-09-12 09:33:10 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2018-09-12 09:33:10 +0200 |
| commit | b9dfc9f6e728e82e727b9f8920a4f0b85f4b0003 (patch) | |
| tree | 13d5f4f3d389cd76dd8cea4d3ae598b93c37c711 | |
| parent | fd62d6242e1aae342245ca66bd8a69d70018f4db (diff) | |
| parent | 646bf732bfcc8dfd77c15d009b959b7c86e867bc (diff) | |
| download | otp-b9dfc9f6e728e82e727b9f8920a4f0b85f4b0003.tar.gz otp-b9dfc9f6e728e82e727b9f8920a4f0b85f4b0003.tar.bz2 otp-b9dfc9f6e728e82e727b9f8920a4f0b85f4b0003.zip | |
Merge branch 'anders/diameter/21.1/OTP-15202' into maint
* anders/diameter/21.1/OTP-15202:
vsn -> 2.1.6
Update appup for 21.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 3389f11937..51830f5276 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -58,7 +58,8 @@ {"2.1.1", [{restart_application, diameter}]}, %% 20.1.2 {"2.1.2", [{restart_application, diameter}]}, %% 20.1.3 {"2.1.3", [{restart_application, diameter}]}, %% 20.2 - {"2.1.4", [{restart_application, diameter}]} %% 20.3 + {"2.1.4", [{restart_application, diameter}]}, %% 20.3 + {"2.1.5", [{update, diameter_peer_fsm}]} %% 21.0 ], [ {"0.9", [{restart_application, diameter}]}, @@ -98,6 +99,7 @@ {"2.1.1", [{restart_application, diameter}]}, {"2.1.2", [{restart_application, diameter}]}, {"2.1.3", [{restart_application, diameter}]}, - {"2.1.4", [{restart_application, diameter}]} + {"2.1.4", [{restart_application, diameter}]}, + {"2.1.5", [{update, diameter_peer_fsm}]} ] }. diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index 3081034df9..8c75c9e55e 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -17,5 +17,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 2.1.5 +DIAMETER_VSN = 2.1.6 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |