aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-17 12:31:57 +0100
committerIngela Anderton Andin <[email protected]>2015-02-17 12:31:57 +0100
commit36a515e52d89a6a5f87c271bdea794394ca35d27 (patch)
treef33c6c3a1dbc2bdf4dfd2bc2f75e8e2329485983 /lib/ssl/src
parentd26260a1d731be4fc37efbd9161e8e58489733bf (diff)
parentd8cdf2d5a069e44935fadc7e0fa3483c93fe5297 (diff)
downloadotp-36a515e52d89a6a5f87c271bdea794394ca35d27.tar.gz
otp-36a515e52d89a6a5f87c271bdea794394ca35d27.tar.bz2
otp-36a515e52d89a6a5f87c271bdea794394ca35d27.zip
Merge branch 'ia/ssl/soft-upgrade-test'
* ia/ssl/soft-upgrade-test: ssl: Prepare for 18 ssl: Add soft upgrade test suite
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl.appup.src8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 7986722094..1476336039 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,14 +1,14 @@
%% -*- erlang -*-
{"%VSN%",
[
- {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
- {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"6\\..*">>, [{restart_application, ssl}]},
+ {<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
- {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
- {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"6\\..*">>, [{restart_application, ssl}]},
+ {<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
]