aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-29 16:02:33 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-12-06 14:47:29 +0100
commit51e291fe0ae69412ee3d2cbde768c92e3f239a2f (patch)
treea92a91598fb11846fe422aed017ee53753ae8db3
parent83422663a34f5518568a9dde8ec2da5d47a4fb8f (diff)
downloadotp-51e291fe0ae69412ee3d2cbde768c92e3f239a2f.tar.gz
otp-51e291fe0ae69412ee3d2cbde768c92e3f239a2f.tar.bz2
otp-51e291fe0ae69412ee3d2cbde768c92e3f239a2f.zip
ssl: Prepare for release
-rw-r--r--lib/ssl/src/ssl.appup.src4
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index c118c129e8..9b1227fa7f 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,8 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"5.1.1", [{restart_application, ssl}]
+ },
{"5.1", [
{load_module, ssl_connection, soft_purge, soft_purge, []}
]
@@ -10,6 +12,8 @@
{<<"3\\.*">>, [{restart_application, ssl}]}
],
[
+ {"5.1.1", [{restart_application, ssl}]
+ },
{"5.1", [
{load_module, ssl_connection, soft_purge, soft_purge, []}
]
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index bc8b8fd039..adfb29e639 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.1.1
+SSL_VSN = 5.1.2