aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-12-15 10:16:57 +0100
committerIngela Anderton Andin <[email protected]>2010-12-16 10:41:53 +0100
commit38d3b11a9d62aa1cfe51377b426c43a5ea7f3350 (patch)
treebe0aa5b34a0e94acfd001678a2f654fc51096091 /lib/ssl
parentb9dcf285187eb0119662069b8c485a9298b324bb (diff)
downloadotp-38d3b11a9d62aa1cfe51377b426c43a5ea7f3350.tar.gz
otp-38d3b11a9d62aa1cfe51377b426c43a5ea7f3350.tar.bz2
otp-38d3b11a9d62aa1cfe51377b426c43a5ea7f3350.zip
Prepare for release
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/ssl.appup.src2
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 51c5289bd2..a9c07ec87c 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,10 +1,12 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"4.1.1", [{restart_application, ssl}]},
{"4.1", [{restart_application, ssl}]},
{"4.0.1", [{restart_application, ssl}]}
],
[
+ {"4.1.1", [{restart_application, ssl}]},
{"4.1", [{restart_application, ssl}]},
{"4.0.1", [{restart_application, ssl}]}
]}.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index ee692adb3b..b1ae0db7e7 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1,2 +1,2 @@
-SSL_VSN = 4.1.1
+SSL_VSN = 4.1.2