aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.appup.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-12-02 09:37:36 +0100
committerIngela Anderton Andin <[email protected]>2014-12-02 09:37:36 +0100
commit826b9ae8b655f18fc2a74f2c9147fb4163a78770 (patch)
tree12b276f0f28db3dbea19d884ada8ef2e7b81a077 /lib/ssl/src/ssl.appup.src
parentd0dc399c5e40980847e462a6c1bc375d02a3a9ca (diff)
parent62ed44035a05091ab4b3438738e717140d115234 (diff)
downloadotp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.tar.gz
otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.tar.bz2
otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
-rw-r--r--lib/ssl/src/ssl.appup.src12
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 9d692379b4..b713f86c1e 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,24 +1,12 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"5.3.6", [{load_module, ssl_handshake, soft_purge, soft_purge, [ssl_connection]}]},
- {"5.3.5", [{load_module, ssl, soft_purge, soft_purge, [ssl_connection]},
- {load_module, ssl_handshake, soft_purge, soft_purge, [ssl_certificate]},
- {load_module, ssl_certificate, soft_purge, soft_purge, []},
- {load_module, ssl_connection, soft_purge, soft_purge, [tls_connection]},
- {update, tls_connection, {advanced, {up, "5.3.5", "5.3.6"}}, [ssl_handshake]}]},
{<<"5\\.3\\.[1-4]($|\\..*)">>, [{restart_application, ssl}]},
{<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
- {"5.3.6", [{load_module, ssl_handshake, soft_purge, soft_purge, [ssl_connection]}]},
- {"5.3.5", [{load_module, ssl, soft_purge, soft_purge,[ssl_certificate]},
- {load_module, ssl_handshake, soft_purge, soft_purge,[ssl_certificate]},
- {load_module, ssl_certificate, soft_purge, soft_purge,[]},
- {load_module, ssl_connection, soft_purge, soft_purge,[tls_connection]},
- {update, tls_connection, {advanced, {down, "5.3.6", "5.3.5"}}, [ssl_handshake]}]},
{<<"5\\.3\\.[1-4]($|\\..*)">>, [{restart_application, ssl}]},
{<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},