diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-07 09:34:25 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-07 09:34:25 +0200 |
| commit | b1da47eff2e41013d60dacebbdfa31ce60357d23 (patch) | |
| tree | 5f4abafc313eaaeb11427b0cdee00fba7d18cc7f | |
| parent | 2d0ef0bfb0cef18d368d9fe7518daa0360f9ad27 (diff) | |
| parent | c6ce327bfca8fc509a66512bcaedb468d4e86d00 (diff) | |
| download | otp-b1da47eff2e41013d60dacebbdfa31ce60357d23.tar.gz otp-b1da47eff2e41013d60dacebbdfa31ce60357d23.tar.bz2 otp-b1da47eff2e41013d60dacebbdfa31ce60357d23.zip | |
Merge branch 'ia/ssl/prepare-for-release' into maint
* ia/ssl/prepare-for-release:
ssl: Prepare for release
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 4 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index a8a494b2fc..9e5bec26f1 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,14 +1,14 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"5.2">>, [{restart_application, ssl}]}, + {<<"5.2\\*">>, [{restart_application, ssl}]}, {<<"5.1\\*">>, [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, {<<"3\\.*">>, [{restart_application, ssl}]} ], [ - {<<"5.2">>, [{restart_application, ssl}]}, + {<<"5.2\\*">>, [{restart_application, ssl}]}, {<<"5.1\\*">>, [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 1f3bef83c8..9dd151553c 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 5.2.1 +SSL_VSN = 5.3 |