aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-03-20 17:06:49 +0100
committerIngela Anderton Andin <[email protected]>2012-03-20 17:18:38 +0100
commitb438fd313917b2e16e5717f12472d5345ca1a976 (patch)
treeb6759264138f4fd91b4cd19fe160a685d83c72aa
parentb82e76c2e34003a474b3a2f62de7c5c91cffa224 (diff)
downloadotp-b438fd313917b2e16e5717f12472d5345ca1a976.tar.gz
otp-b438fd313917b2e16e5717f12472d5345ca1a976.tar.bz2
otp-b438fd313917b2e16e5717f12472d5345ca1a976.zip
Prepare for patch relese
Four digit version number as we backmerged part of R15 solutions
-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 29674f30da..1b07e76d6a 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,7 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"4.1.6", [{restart_application, ssl}]},
{"4.1.5", [{restart_application, ssl}]},
{"4.1.4", [{restart_application, ssl}]},
{"4.1.3", [{restart_application, ssl}]},
@@ -10,6 +11,7 @@
{"4.0.1", [{restart_application, ssl}]}
],
[
+ {"4.1.6", [{restart_application, ssl}]},
{"4.1.5", [{restart_application, ssl}]},
{"4.1.4", [{restart_application, ssl}]},
{"4.1.3", [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 8286201df4..527c4f379a 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 4.1.6
+SSL_VSN = 4.1.6.1