diff options
| author | Erlang/OTP <[email protected]> | 2013-08-21 12:54:38 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-08-21 12:54:38 +0200 |
| commit | b6b47d4c18c88380ea104aab57e13363c7b24a51 (patch) | |
| tree | 7083aba98b243d6a1cd6aa279da737295f4f22bf /lib/ssl/src/ssl.appup.src | |
| parent | a21db4078a7b5f23b665dc2d466541b394936cb8 (diff) | |
| parent | 2ab0f356a00f42060d0f4ca9c4225644e2d9052e (diff) | |
| download | otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.tar.gz otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.tar.bz2 otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.zip | |
Merge branch 'fredrik/inets/ssl/fixup_log_alert_option/OTP-11259' into maint-r15
* fredrik/inets/ssl/fixup_log_alert_option/OTP-11259:
[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel added as option to inets conf file
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 9b1227fa7f..664f588003 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,11 @@ %% -*- erlang -*- {"%VSN%", [ + {"5.1.2", + [ + {restart_application, inets} + ] + }, {"5.1.1", [{restart_application, ssl}] }, {"5.1", [ @@ -12,6 +17,11 @@ {<<"3\\.*">>, [{restart_application, ssl}]} ], [ + {"5.1.2", + [ + {restart_application, inets} + ] + }, {"5.1.1", [{restart_application, ssl}] }, {"5.1", [ |