aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-11-09 17:01:46 +0100
committerIngela Anderton Andin <[email protected]>2017-11-09 17:01:46 +0100
commit2c139dca10767353cc4836cb10157d05bea20a5c (patch)
treec219aa433edf92a82bd6cc82ddbe6246bb2498b9
parentde3b9cdb8521d7edd524b4e17d1e3f883f832ec0 (diff)
downloadotp-2c139dca10767353cc4836cb10157d05bea20a5c.tar.gz
otp-2c139dca10767353cc4836cb10157d05bea20a5c.tar.bz2
otp-2c139dca10767353cc4836cb10157d05bea20a5c.zip
ssl: Prepare for release
-rw-r--r--lib/ssl/src/ssl.appup.src10
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 203a4f7d10..11728128c4 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,20 +1,14 @@
%% -*- erlang -*-
{"%VSN%",
[
- {<<"^7[.]3[.]3$">>,
- [{load_module, ssl_handshake, soft_purge, soft_purge, []}
- ]},
- {<<"^7[.][^.].*">>, [{restart_application, ssl}]},
+ {<<"7\\..*">>, [{restart_application, ssl}]},
{<<"6\\..*">>, [{restart_application, ssl}]},
{<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
- {<<"^7[.]3[.]3$">>,
- [{load_module, ssl_handshake, soft_purge, soft_purge, []}
- ]},
- {<<"^7[.][^.].*">>, [{restart_application, ssl}]},
+ {<<"7\\..*">>, [{restart_application, ssl}]},
{<<"6\\..*">>, [{restart_application, ssl}]},
{<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index d9391ea543..48f260f3e5 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 7.3.3.1
+SSL_VSN = 7.3.3.2