diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-07 09:35:09 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-07 09:35:09 +0200 |
| commit | 2aa5ae6f94d11fc63920db1e5ef2e8933a428794 (patch) | |
| tree | cf066b2244915086d1c9f0a6ca8189d579e49488 /lib | |
| parent | 0e834fdf2cdc7e0f67f0762afe364f375aac547f (diff) | |
| parent | b1da47eff2e41013d60dacebbdfa31ce60357d23 (diff) | |
| download | otp-2aa5ae6f94d11fc63920db1e5ef2e8933a428794.tar.gz otp-2aa5ae6f94d11fc63920db1e5ef2e8933a428794.tar.bz2 otp-2aa5ae6f94d11fc63920db1e5ef2e8933a428794.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib')
| -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 |