aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.appup.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-01-20 16:00:28 +0100
committerIngela Anderton Andin <[email protected]>2011-01-20 16:00:28 +0100
commit4c70b07402581cbcdc1204961344cb28bf383d20 (patch)
treedbc7cd3d708cd78b4f4e130c6370e588d4e4e026 /lib/ssl/src/ssl.appup.src
parente0120ba9ae60392cff67d7f17649353f516b1ab3 (diff)
parent6deca2a989772f261b59f11da031832f1ea9c45d (diff)
downloadotp-4c70b07402581cbcdc1204961344cb28bf383d20.tar.gz
otp-4c70b07402581cbcdc1204961344cb28bf383d20.tar.bz2
otp-4c70b07402581cbcdc1204961344cb28bf383d20.zip
Merge branch 'maint-r14' into dev
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
-rw-r--r--lib/ssl/src/ssl.appup.src2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index a9c07ec87c..e6a8c557fc 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,11 +1,13 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"4.1.2", [{restart_application, ssl}]},
{"4.1.1", [{restart_application, ssl}]},
{"4.1", [{restart_application, ssl}]},
{"4.0.1", [{restart_application, ssl}]}
],
[
+ {"4.1.2", [{restart_application, ssl}]},
{"4.1.1", [{restart_application, ssl}]},
{"4.1", [{restart_application, ssl}]},
{"4.0.1", [{restart_application, ssl}]}