diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-03-22 09:46:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-03-22 09:46:55 +0100 |
| commit | 9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc (patch) | |
| tree | 25ce136a104a9a6c0595442cc4e33052ff3673bd | |
| parent | 33e42a694e0ddd8a6c02bfe6c04298ca95aa938a (diff) | |
| parent | 7ae61df3b0e41397e9731d8aa115905f6ff0a45c (diff) | |
| download | otp-9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc.tar.gz otp-9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc.tar.bz2 otp-9bc49f73de1e2d5eb3bf94f4598f1d92f4475edc.zip | |
Merge branch 'ia/ssl/prepare-for-release' into maint
* ia/ssl/prepare-for-release:
Prepare for release
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 22 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 7 insertions, 17 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}]} ]}. diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 2255798f1d..0fccbfe908 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 5.0 +SSL_VSN = 5.0.1 |