diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-03 10:55:37 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-03 11:07:31 +0100 |
| commit | 97531f2f4dbd4bf7426434792e7e6af6aa8e12ef (patch) | |
| tree | 3e3974f885d1921ef264ac00f3096a053b9035df | |
| parent | d9fd104e64eccbdca2a9d7d3efb801c8d85ecb18 (diff) | |
| download | otp-97531f2f4dbd4bf7426434792e7e6af6aa8e12ef.tar.gz otp-97531f2f4dbd4bf7426434792e7e6af6aa8e12ef.tar.bz2 otp-97531f2f4dbd4bf7426434792e7e6af6aa8e12ef.zip | |
ssl: Prepare for release
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 8 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index d100e41930..4c4163d7fd 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,14 +1,18 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"6.0">>, [{load_module, ssl_handshake, soft_purge, soft_purge, []}]}, + {<<"6.0.1">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]}, + {<<"6.0">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}, + {load_module, ssl_handshake, soft_purge, soft_purge, []}]}, {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]}, {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]}, {<<"4\\..*">>, [{restart_application, ssl}]}, {<<"3\\..*">>, [{restart_application, ssl}]} ], [ - {<<"6.0">>, [{load_module, ssl_handshake, soft_purge, soft_purge, []}]}, + {<<"6.0.1">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]}, + {<<"6.0">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}, + {load_module, ssl_handshake, soft_purge, soft_purge, []}]}, {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]}, {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]}, {<<"4\\..*">>, [{restart_application, ssl}]}, diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index d5a9a71736..eedf8cf705 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 6.0.1 +SSL_VSN = 6.0.1.1 |