aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.appup.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-03-22 09:50:03 +0100
committerIngela Anderton Andin <[email protected]>2012-03-22 09:50:03 +0100
commit5d7ed57d07118f95cf970ee655ea8eea76cbe6fd (patch)
treec59721c8a811f3185290c0a25d1085b85993ca12 /lib/ssl/src/ssl.appup.src
parent2497698a1715462d8785179eacb9975adb35a767 (diff)
parentb2b96f8b37143e760cfe6638c6c4b3bd34604e1f (diff)
downloadotp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.tar.gz
otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.tar.bz2
otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.zip
Merge remote branch 'upstream/maint'
* upstream/maint: Prepare for release Prepare for release Prepare for release
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
-rw-r--r--lib/ssl/src/ssl.appup.src22
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 1b07e76d6a..e346b1e9e6 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,23 +1,13 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"4.1.6", [{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}]},
- {"4.1.1", [{restart_application, ssl}]},
- {"4.1", [{restart_application, ssl}]},
- {"4.0.1", [{restart_application, ssl}]}
+ {"5.0", [{restart_application, ssl}]},
+ {<<"4\\.*">>, [{restart_application, ssl}]},
+ {<<"3\\.*">>, [{restart_application, ssl}]}
],
[
- {"4.1.6", [{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}]},
- {"4.1.1", [{restart_application, ssl}]},
- {"4.1", [{restart_application, ssl}]},
- {"4.0.1", [{restart_application, ssl}]}
+ {"5.0", [{restart_application, ssl}]},
+ {<<"4\\.*">>, [{restart_application, ssl}]},
+ {<<"3\\.*">>, [{restart_application, ssl}]}
]}.