diff options
| author | John Högberg <[email protected]> | 2018-05-03 08:13:58 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-05-03 08:13:58 +0200 |
| commit | 7588c6f850c59ef2fa338b38ac1cf141af4f69f2 (patch) | |
| tree | fb09c33a2e38eed82111a263b6ce595c67ef1b36 /lib/ssl/src | |
| parent | 6ab00dd854b70e0a4ad06fa802a5ebb1b4871721 (diff) | |
| parent | 26eea10dda1f316045e58e30a126feafe1843d3a (diff) | |
| download | otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.gz otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.bz2 otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
ssl: Prepare for release
ssl: Proper handling of clients that choose to send an empty answer to a certificate request
heart: Use ntohs instead of manual conversion
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 4ad2a2f1fd..bfdd0c205b 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,7 +1,6 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"8.2.4">>, [{load_module, ssl_cipher, 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.2.4">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]}, {<<"8\\..*">>, [{restart_application, ssl}]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, |