diff options
| author | John Högberg <[email protected]> | 2017-10-25 08:52:04 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-10-25 08:52:04 +0200 |
| commit | c26f0e58f440859abbfb9b4e3570713ac722e0da (patch) | |
| tree | 6bcbc29c8f4501c05a598262787ef06fb5a7666c /lib/diameter/src/diameter.appup.src | |
| parent | 541ee20b9eaefed7802f08cecddfbd12e5f3b516 (diff) | |
| parent | a98379d0519c28f9bc9b673ed2c09fb1ad52456e (diff) | |
| download | otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.gz otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.bz2 otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
erts: Fix so that bind correct schedulers
Update version
Fix error handling when decoding an AVP with an alternate dictionary
Remove unused function arguments
Fix faulty recursion
vsn -> 2.1.2
Update appup for ERIERL-14684
Fix speling error 'sndbuf' -> 'recbuf'
Add zlib:set_controlling_process/2
Diffstat (limited to 'lib/diameter/src/diameter.appup.src')
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index c2198de9ea..d0e58e8410 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -54,7 +54,9 @@ {"1.12.1", [{restart_application, diameter}]}, %% 19.1 {"1.12.2", [{restart_application, diameter}]}, %% 19.3 {"2.0", [{restart_application, diameter}]}, %% 20.0 - {"2.1", [{update, diameter_reg, {advanced, "2.1"}}]} %% 20.1 + {"2.1", [{load_module, diameter_gen}, %% 20.1 + {update, diameter_reg, {advanced, "2.1"}}]}, + {"2.1.1", [{load_module, diameter_gen}]} ], [ {"0.9", [{restart_application, diameter}]}, @@ -90,6 +92,7 @@ {"1.12.1", [{restart_application, diameter}]}, {"1.12.2", [{restart_application, diameter}]}, {"2.0", [{restart_application, diameter}]}, - {"2.1", [{restart_application, diameter}]} + {"2.1", [{restart_application, diameter}]}, + {"2.1.1", [{load_module, diameter_gen}]} ] }. |