aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-02-19 11:17:22 +0100
committerIngela Anderton Andin <[email protected]>2013-02-19 11:17:22 +0100
commit1a0dde3554adf6ad30cb80ddc90d3ed1a8c8dbad (patch)
treefb8a7170b2216530ca3d1473259dfbb9b64b3f7c /lib
parent7ebb2ae46e21946aa13ef815628a156be42f0927 (diff)
parent566b3f13d4b9cc0c353eacb6ea3f5c713ec894f0 (diff)
downloadotp-1a0dde3554adf6ad30cb80ddc90d3ed1a8c8dbad.tar.gz
otp-1a0dde3554adf6ad30cb80ddc90d3ed1a8c8dbad.tar.bz2
otp-1a0dde3554adf6ad30cb80ddc90d3ed1a8c8dbad.zip
Merge branch 'ia/ssl/prep-for-release'
* ia/ssl/prep-for-release: ssl: Prepare for R16B
Diffstat (limited to 'lib')
-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 76e14860ec..a8a494b2fc 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,12 +1,14 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {<<"5.2">>, [{restart_application, ssl}]},
{<<"5.1\\*">>, [{restart_application, ssl}]},
{<<"5.0\\*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
{<<"3\\.*">>, [{restart_application, ssl}]}
],
[
+ {<<"5.2">>, [{restart_application, ssl}]},
{<<"5.1\\*">>, [{restart_application, ssl}]},
{<<"5.0\\*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index cb73e86ede..1f3bef83c8 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.2
+SSL_VSN = 5.2.1