aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/crypto/Makefile2
-rw-r--r--lib/ssl/src/ssl.appup.src3
-rw-r--r--lib/ssl/vsn.mk2
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 2a8fc6acfd..6db5b03912 100644
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -36,4 +36,4 @@ SPECIAL_TARGETS =
include $(ERL_TOP)/make/otp_subdir.mk
-# touched by patch 1176
+# touched by patch 1178
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 29674f30da..6b4b62abc2 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,7 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"4.1.5.1", [{restart_application, ssl}]},
{"4.1.5", [{restart_application, ssl}]},
{"4.1.4", [{restart_application, ssl}]},
{"4.1.3", [{restart_application, ssl}]},
@@ -10,7 +11,7 @@
{"4.0.1", [{restart_application, ssl}]}
],
[
- {"4.1.5", [{restart_application, ssl}]},
+ {"4.1.5.1", [{restart_application, ssl}]},
{"4.1.4", [{restart_application, ssl}]},
{"4.1.3", [{restart_application, ssl}]},
{"4.1.2", [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 64a7603c44..deb554d73d 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 4.1.5.1
+SSL_VSN = 4.1.5.2