aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-16 11:15:29 +0200
committerIngela Anderton Andin <[email protected]>2015-09-16 11:15:29 +0200
commitb1206abc5c5d0715e905ccbb6877beb48ffd0eb4 (patch)
tree62a5bd663f82dbc90b45ea7705e2a6f2ac2e95bb
parent36502d2334744bf841457119d6907c4edbd72109 (diff)
parentf0841ed29c96220d1a7c0b2ce7fa19795ec20816 (diff)
downloadotp-b1206abc5c5d0715e905ccbb6877beb48ffd0eb4.tar.gz
otp-b1206abc5c5d0715e905ccbb6877beb48ffd0eb4.tar.bz2
otp-b1206abc5c5d0715e905ccbb6877beb48ffd0eb4.zip
Merge branch 'maint'
-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