aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-16 11:14:46 +0200
committerIngela Anderton Andin <[email protected]>2015-09-16 11:14:46 +0200
commitf0841ed29c96220d1a7c0b2ce7fa19795ec20816 (patch)
treea628d741aaabf6af185077e68838ea5ebcbbf1ce
parentc019481b3ff418de76886b955ba9238a12ea856a (diff)
parentfcfffa3eba6adba9d1cf2c78aca5788025f0f5df (diff)
downloadotp-f0841ed29c96220d1a7c0b2ce7fa19795ec20816.tar.gz
otp-f0841ed29c96220d1a7c0b2ce7fa19795ec20816.tar.bz2
otp-f0841ed29c96220d1a7c0b2ce7fa19795ec20816.zip
Merge branch 'ia/ssl/next-version' into maint
* ia/ssl/next-version: ssl: Prepare for release
-rw-r--r--lib/ssl/src/ssl.appup.src12
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 1476336039..c95326941c 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,12 +1,24 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {<<"7.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
+ {load_module, ssl_connection, soft_purge, soft_purge, []},
+ {load_module, tls_connection, soft_purge, soft_purge, []},
+ {load_module, ssl_session, soft_purge, soft_purge, []},
+ {load_module, ssl_session_cache, soft_purge, soft_purge, []}
+ ]},
{<<"6\\..*">>, [{restart_application, ssl}]},
{<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
+ {<<"7.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
+ {load_module, ssl_connection, soft_purge, soft_purge, []},
+ {load_module, tls_connection, soft_purge, soft_purge, []},
+ {load_module, ssl_session, soft_purge, soft_purge, []},
+ {load_module, ssl_session_cache, soft_purge, soft_purge, []}
+ ]},
{<<"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 171147adf2..4587c448f6 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 7.0
+SSL_VSN = 7.1