aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-09-10 10:26:48 +0200
committerIngela Anderton Andin <[email protected]>2013-09-10 10:26:48 +0200
commitad4d72a4b1c89761416f0dbe61920718507d915a (patch)
tree1a768f6788433d11be89f4282c077d4e5029cd5c
parent13c9f03c03161ac2e2c61f5f1e2a1d40306a1a13 (diff)
parent8ee301f7d4a6e7b3254737e9e18250e266441ac6 (diff)
downloadotp-ad4d72a4b1c89761416f0dbe61920718507d915a.tar.gz
otp-ad4d72a4b1c89761416f0dbe61920718507d915a.tar.bz2
otp-ad4d72a4b1c89761416f0dbe61920718507d915a.zip
Merge remote-tracking branch 'upstream/maint'
-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 9e5bec26f1..c090b6ebfb 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,7 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {<<"5.3\\*">>, [{restart_application, ssl}]},
{<<"5.2\\*">>, [{restart_application, ssl}]},
{<<"5.1\\*">>, [{restart_application, ssl}]},
{<<"5.0\\*">>, [{restart_application, ssl}]},
@@ -8,6 +9,7 @@
{<<"3\\.*">>, [{restart_application, ssl}]}
],
[
+ {<<"5.3\\*">>, [{restart_application, ssl}]},
{<<"5.2\\*">>, [{restart_application, ssl}]},
{<<"5.1\\*">>, [{restart_application, ssl}]},
{<<"5.0\\*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 9dd151553c..78424ee578 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.3
+SSL_VSN = 5.3.1