aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-14 14:29:20 +0100
committerIngela Anderton Andin <[email protected]>2012-11-14 14:29:20 +0100
commitc91f3bb9e5f2ad93b7eeabe32bc017533ea3d940 (patch)
tree20e3662cde7e664226ed4470714fd052ddc95aa6 /lib
parent55c2b0b6d55fe6a011671832b5529cb1c7b636a8 (diff)
downloadotp-c91f3bb9e5f2ad93b7eeabe32bc017533ea3d940.tar.gz
otp-c91f3bb9e5f2ad93b7eeabe32bc017533ea3d940.tar.bz2
otp-c91f3bb9e5f2ad93b7eeabe32bc017533ea3d940.zip
ssl: Update vsn.mk and ssl.appup.src for release
Diffstat (limited to 'lib')
-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