diff options
| author | Rickard Green <[email protected]> | 2017-10-11 15:17:55 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-10-11 15:17:55 +0200 |
| commit | cdb5529d58d35eee831da3c4ae2329c7d6626f51 (patch) | |
| tree | 31ddccf50f1a802011b6832d2c8b5a71abba7e08 /lib/diameter/src/diameter.appup.src | |
| parent | 5c917e33b53a397b30ca56a9cdd9922d9df19e7d (diff) | |
| parent | 9cccec48c38544df1d00230aeb340b37890ab8c8 (diff) | |
| download | otp-cdb5529d58d35eee831da3c4ae2329c7d6626f51.tar.gz otp-cdb5529d58d35eee831da3c4ae2329c7d6626f51.tar.bz2 otp-cdb5529d58d35eee831da3c4ae2329c7d6626f51.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
vsn -> 2.1.1
Update appup and code_change for ERIERL-83
Fix missing monitor in diameter_reg
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/diameter/src/diameter.appup.src')
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index 7566cf25c3..c2198de9ea 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -53,7 +53,8 @@ {"1.12", [{restart_application, diameter}]}, %% 19.0 {"1.12.1", [{restart_application, diameter}]}, %% 19.1 {"1.12.2", [{restart_application, diameter}]}, %% 19.3 - {"2.0", [{restart_application, diameter}]} %% 20.0 + {"2.0", [{restart_application, diameter}]}, %% 20.0 + {"2.1", [{update, diameter_reg, {advanced, "2.1"}}]} %% 20.1 ], [ {"0.9", [{restart_application, diameter}]}, @@ -88,6 +89,7 @@ {"1.12", [{restart_application, diameter}]}, {"1.12.1", [{restart_application, diameter}]}, {"1.12.2", [{restart_application, diameter}]}, - {"2.0", [{restart_application, diameter}]} + {"2.0", [{restart_application, diameter}]}, + {"2.1", [{restart_application, diameter}]} ] }. |