diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-05-02 10:42:36 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-05-02 10:42:36 +0200 |
| commit | 19e87d1de32c80cb1ef38410457d5f946f16f0f9 (patch) | |
| tree | 20e585b7b755b968f0622c407caf2ba01831ad6a | |
| parent | 3c483c22bb4701ee8a26b7324cd1a7a6c22448ce (diff) | |
| parent | 661b257335032ebd1508c28eaecf05fdc97a5d40 (diff) | |
| download | otp-19e87d1de32c80cb1ef38410457d5f946f16f0f9.tar.gz otp-19e87d1de32c80cb1ef38410457d5f946f16f0f9.tar.bz2 otp-19e87d1de32c80cb1ef38410457d5f946f16f0f9.zip | |
Merge branch 'ingela/ssl/prepare-release'
* ingela/ssl/prepare-release:
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, 1 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 2eda9d9491..bfdd0c205b 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,7 +1,6 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"8.1.1">>, [{load_module, tls_connection, soft_purge, soft_purge, []}]}, {<<"8\\..*">>, [{restart_application, ssl}]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, @@ -10,7 +9,6 @@ {<<"3\\..*">>, [{restart_application, ssl}]} ], [ - {<<"8.1.1">>, [{load_module, tls_connection, soft_purge, soft_purge, []}]}, {<<"8\\..*">>, [{restart_application, ssl}]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 82184f5c74..25b2a2bec0 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 8.1.2 +SSL_VSN = 8.2 |