diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2013-09-10 10:26:25 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2013-09-10 10:26:25 +0200 |
| commit | 8ee301f7d4a6e7b3254737e9e18250e266441ac6 (patch) | |
| tree | 64a8df2fae892facd52cdba2ab158b15dbcf3560 | |
| parent | 23de86802028de4e1dd2fe8169d4f448c0ac72bc (diff) | |
| parent | 90f4df21faaf278d50ef255fef1f4a37cc259103 (diff) | |
| download | erlang-8ee301f7d4a6e7b3254737e9e18250e266441ac6.tar.gz | |
Merge branch 'ia/prep-release/ssl' into maint
* ia/prep-release/ssl:
ssl: Prepare for release
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 9e5bec26f1..c090b6ebfb 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,7 @@ %% -*- erlang -*- {"%VSN%", [ + {<<"5.3\\*">>, [{restart_application, ssl}]}, {<<"5.2\\*">>, [{restart_application, ssl}]}, {<<"5.1\\*">>, [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, @@ -8,6 +9,7 @@ {<<"3\\.*">>, [{restart_application, ssl}]} ], [ + {<<"5.3\\*">>, [{restart_application, ssl}]}, {<<"5.2\\*">>, [{restart_application, ssl}]}, {<<"5.1\\*">>, [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 9dd151553c..78424ee578 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 5.3 +SSL_VSN = 5.3.1 |