aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-15 14:10:21 +0100
committerIngela Anderton Andin <[email protected]>2012-11-15 14:10:21 +0100
commitbdc34f0f247628bc285143f250192e4c6016c812 (patch)
treebbb910cc2eac6cc6accf845d0a92fc0145200a98 /lib/ssl
parent042c2986445465f843e5dc4be4df34b28381d0d2 (diff)
parentc91f3bb9e5f2ad93b7eeabe32bc017533ea3d940 (diff)
downloadotp-bdc34f0f247628bc285143f250192e4c6016c812.tar.gz
otp-bdc34f0f247628bc285143f250192e4c6016c812.tar.bz2
otp-bdc34f0f247628bc285143f250192e4c6016c812.zip
Merge branch 'ia/ssl/prepare-for-release' into maint
* ia/ssl/prepare-for-release: ssl: Update vsn.mk and ssl.appup.src for release
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/ssl.appup.src15
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 76550fa04b..c118c129e8 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,14 +1,21 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"5.0.1", [{restart_application, ssl}]},
- {"5.0", [{restart_application, ssl}]},
+ {"5.1", [
+ {load_module, ssl_connection, soft_purge, soft_purge, []}
+ ]
+ },
+ {<<"5.0\\*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
{<<"3\\.*">>, [{restart_application, ssl}]}
],
[
- {"5.0.1", [{restart_application, ssl}]},
- {"5.0", [{restart_application, ssl}]},
+ {"5.1", [
+ {load_module, ssl_connection, soft_purge, soft_purge, []}
+ ]
+ },
+ {"5.1", [{restart_application, ssl}]},
+ {<<"5.0\\*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
{<<"3\\.*">>, [{restart_application, ssl}]}
]}.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index e381b73c27..bc8b8fd039 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.1
+SSL_VSN = 5.1.1