diff options
| author | Raimo Niskanen <[email protected]> | 2016-07-21 10:49:56 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-07-21 10:49:56 +0200 |
| commit | ebb1f362db55f2ec26a3ed509267e25303feddf4 (patch) | |
| tree | f42560b30203cc4423cdac3d31f277bf6166d7b7 /lib/ssl/src/ssl.appup.src | |
| parent | b490fb8664ec6e5ceaadc1c74350dc666f5406d2 (diff) | |
| parent | a138a928849f3b68a2542f2592e95e7362217e3d (diff) | |
| download | otp-ebb1f362db55f2ec26a3ed509267e25303feddf4.tar.gz otp-ebb1f362db55f2ec26a3ed509267e25303feddf4.tar.bz2 otp-ebb1f362db55f2ec26a3ed509267e25303feddf4.zip | |
Merge branch 'raimo/ssl/version-selection/maint-18/OTP-13753' into raimo/ssl/version-selection/maint-19/OTP-13753
Conflicts:
lib/ssl/vsn.mk
lib/ssl/src/ssl.appup.src
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 11728128c4..fadc67ef80 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,14 +1,20 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"7\\..*">>, [{restart_application, ssl}]}, + {<<"^8[.]0$">>, + [{load_module, ssl_handshake, soft_purge, soft_purge, []} + ]}, + {<<"^7[.][^.].*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, {<<"5\\..*">>, [{restart_application, ssl}]}, {<<"4\\..*">>, [{restart_application, ssl}]}, {<<"3\\..*">>, [{restart_application, ssl}]} ], [ - {<<"7\\..*">>, [{restart_application, ssl}]}, + {<<"^8[.]0$">>, + [{load_module, ssl_handshake, soft_purge, soft_purge, []} + ]}, + {<<"^7[.][^.].*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, {<<"5\\..*">>, [{restart_application, ssl}]}, {<<"4\\..*">>, [{restart_application, ssl}]}, |