diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-02-04 13:54:57 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-02-05 10:32:20 +0100 |
| commit | ed71fcbe9864fd082cf26f435df1ee7ba8b4ebb1 (patch) | |
| tree | f18eda66e2667aff01604940630507eb9b0d1ca6 | |
| parent | 28eb7e0a25aed6153433ab3e93f023b194d0d858 (diff) | |
| download | otp-ed71fcbe9864fd082cf26f435df1ee7ba8b4ebb1.tar.gz otp-ed71fcbe9864fd082cf26f435df1ee7ba8b4ebb1.tar.bz2 otp-ed71fcbe9864fd082cf26f435df1ee7ba8b4ebb1.zip | |
ssl: Fix broken appup from ssl-5.2.1.1 that was released together with
inets-5.9.2.2
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 29 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 7 insertions, 24 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 664f588003..c04d29bfc6 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,34 +1,17 @@ %% -*- erlang -*- {"%VSN%", [ - {"5.1.2", - [ - {restart_application, inets} - ] - }, - {"5.1.1", [{restart_application, ssl}] - }, - {"5.1", [ - {load_module, ssl_connection, soft_purge, soft_purge, []} - ] - }, + {"5.1.2", [{restart_application, ssl}]}, + {"5.1.1", [{restart_application, ssl}]}, + {"5.1", [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, {<<"3\\.*">>, [{restart_application, ssl}]} ], [ - {"5.1.2", - [ - {restart_application, inets} - ] - }, - {"5.1.1", [{restart_application, ssl}] - }, - {"5.1", [ - {load_module, ssl_connection, soft_purge, soft_purge, []} - ] - }, - {"5.1", [{restart_application, ssl}]}, + {"5.1.2", [{restart_application, ssl}]}, + {"5.1.1", [{restart_application, ssl}]}, + {"5.1", [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, {<<"3\\.*">>, [{restart_application, ssl}]} diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 84728fd311..7b9b6d03bc 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 5.1.2.1 +SSL_VSN = 5.1.2.2 |