aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.appup.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-01-22 14:19:29 +0100
committerIngela Anderton Andin <[email protected]>2013-01-22 14:19:29 +0100
commit9b01d9553434256b93b4899caf042d857f6ef068 (patch)
tree523c2ff056058002840a94352284c5ac244ace9a /lib/ssl/src/ssl.appup.src
parentf7059ffbf0d9e7767eba1d4d96b291bfc96ef767 (diff)
parentacb225d301f6a1bcb02c607295e370471b7834bb (diff)
downloadotp-9b01d9553434256b93b4899caf042d857f6ef068.tar.gz
otp-9b01d9553434256b93b4899caf042d857f6ef068.tar.bz2
otp-9b01d9553434256b93b4899caf042d857f6ef068.zip
Merge branch 'ia/ssl/prepare-for-release'
* ia/ssl/prepare-for-release: ssl: Prepare for R16 release
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
-rw-r--r--lib/ssl/src/ssl.appup.src15
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 9b1227fa7f..76e14860ec 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,24 +1,13 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"5.1.1", [{restart_application, ssl}]
- },
- {"5.1", [
- {load_module, ssl_connection, soft_purge, soft_purge, []}
- ]
- },
+ {<<"5.1\\*">>, [{restart_application, ssl}]},
{<<"5.0\\*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
{<<"3\\.*">>, [{restart_application, ssl}]}
],
[
- {"5.1.1", [{restart_application, ssl}]
- },
- {"5.1", [
- {load_module, ssl_connection, soft_purge, soft_purge, []}
- ]
- },
- {"5.1", [{restart_application, ssl}]},
+ {<<"5.1\\*">>, [{restart_application, ssl}]},
{<<"5.0\\*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
{<<"3\\.*">>, [{restart_application, ssl}]}