aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-06-10 09:01:12 +0200
committerIngela Anderton Andin <[email protected]>2015-06-10 09:01:12 +0200
commit8cd756a528572ae4275e2716428f488cf720f18c (patch)
treeb71335ae882ae84c80201ce4d27e9b8744c81fa8 /lib/ssl
parent07995bee41aeaace06e5a3e11912122e710552f5 (diff)
parentfb85a14e48875c7eaaa1144369d02708c3cab70e (diff)
downloadotp-8cd756a528572ae4275e2716428f488cf720f18c.tar.gz
otp-8cd756a528572ae4275e2716428f488cf720f18c.tar.bz2
otp-8cd756a528572ae4275e2716428f488cf720f18c.zip
Merge branch 'ia/ssl/appup'
* ia/ssl/appup: ssl: Update appup for 18
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/ssl.appup.src10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index d100e41930..1476336039 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,16 +1,14 @@
%% -*- erlang -*-
{"%VSN%",
[
- {<<"6.0">>, [{load_module, ssl_handshake, soft_purge, soft_purge, []}]},
- {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
- {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"6\\..*">>, [{restart_application, ssl}]},
+ {<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
- {<<"6.0">>, [{load_module, ssl_handshake, soft_purge, soft_purge, []}]},
- {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
- {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"6\\..*">>, [{restart_application, ssl}]},
+ {<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
]