aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-12-03 10:55:50 +0100
committerIngela Anderton Andin <[email protected]>2014-12-03 10:55:50 +0100
commit7bd5f22cd0d89e7a763ff6e33bfc05daa329dd43 (patch)
tree3f98828b95b1cfb49b0048745990e40785b7a6bd
parent5e44955a84b20b6c832b8a90b9965a655f54a056 (diff)
parent588e344102ac9d9a6954336a650087a54c84fa53 (diff)
downloadotp-7bd5f22cd0d89e7a763ff6e33bfc05daa329dd43.tar.gz
otp-7bd5f22cd0d89e7a763ff6e33bfc05daa329dd43.tar.bz2
otp-7bd5f22cd0d89e7a763ff6e33bfc05daa329dd43.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/src/ssl.appup.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index b713f86c1e..7986722094 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,13 +1,13 @@
%% -*- erlang -*-
{"%VSN%",
[
- {<<"5\\.3\\.[1-4]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
{<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
- {<<"5\\.3\\.[1-4]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
{<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}