aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.appup.src
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-06-27 16:43:37 +0200
committerAnders Svensson <[email protected]>2011-06-27 16:43:37 +0200
commitbd6666300edb76e09c07508e3513f7bdde985b43 (patch)
tree1e735ae4a1ab2b63597f43ec342cefcd77513563 /lib/ssl/src/ssl.appup.src
parent916e80959746c467ff858538e35f3c0105dbbced (diff)
parent1049243404cc52cad5ce1f1d2d37383a2ca06160 (diff)
downloadotp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.gz
otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.bz2
otp-bd6666300edb76e09c07508e3513f7bdde985b43.zip
Merge remote branch 'upstream/dev' 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 cf8867245b..29674f30da 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,7 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"4.1.5", [{restart_application, ssl}]},
{"4.1.4", [{restart_application, ssl}]},
{"4.1.3", [{restart_application, ssl}]},
{"4.1.2", [{restart_application, ssl}]},
@@ -9,6 +10,7 @@
{"4.0.1", [{restart_application, ssl}]}
],
[
+ {"4.1.5", [{restart_application, ssl}]},
{"4.1.4", [{restart_application, ssl}]},
{"4.1.3", [{restart_application, ssl}]},
{"4.1.2", [{restart_application, ssl}]},