aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.appup.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-12-09 09:56:38 +0100
committerIngela Anderton Andin <[email protected]>2015-12-09 09:56:38 +0100
commit8f91fc9576aa4abadf7e20e5aaabec1b37832145 (patch)
treed9da25188ffaa0cef1fdae4ff5e0af0a87eda12e /lib/ssl/src/ssl.appup.src
parent0a26778f89e58b5edcbf9c2e5a55eb702ef80593 (diff)
parent80bf91029f9afcef147493a449ad0ae328efb3ae (diff)
downloadotp-8f91fc9576aa4abadf7e20e5aaabec1b37832145.tar.gz
otp-8f91fc9576aa4abadf7e20e5aaabec1b37832145.tar.bz2
otp-8f91fc9576aa4abadf7e20e5aaabec1b37832145.zip
Merge branch 'ia/ssl-prepare-release' into maint
* ia/ssl-prepare-release: ssl: Correct spec ssl: Prepare for release
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
-rw-r--r--lib/ssl/src/ssl.appup.src14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 8d5bd6f8d8..11728128c4 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,24 +1,14 @@
%% -*- 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, []}
- ]},
+ {<<"7\\..*">>, [{restart_application, ssl}]},
{<<"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, []}
- ]},
+ {<<"7\\..*">>, [{restart_application, ssl}]},
{<<"6\\..*">>, [{restart_application, ssl}]},
{<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},