aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.appup.src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2014-10-15 14:57:08 +0200
committerHans Nilsson <[email protected]>2014-10-15 14:57:08 +0200
commit7b2760a6f9991d754687a81c51410c2282ff0b07 (patch)
treefe76c5ab10c16e065f1ffa907de67e8c575c5f97 /lib/ssl/src/ssl.appup.src
parent7c4237e6d34b23020fca983731a3c7f07a10a8b5 (diff)
parent647c0e162fafcdc1810eb25b2f67fe6adee38ced (diff)
downloadotp-7b2760a6f9991d754687a81c51410c2282ff0b07.tar.gz
otp-7b2760a6f9991d754687a81c51410c2282ff0b07.tar.bz2
otp-7b2760a6f9991d754687a81c51410c2282ff0b07.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
-rw-r--r--lib/ssl/src/ssl.appup.src2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 650901ef54..9d692379b4 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,7 @@
%% -*- 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, []},
@@ -12,6 +13,7 @@
{<<"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,[]},