diff options
| author | Raimo Niskanen <[email protected]> | 2016-08-31 10:28:02 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-08-31 10:28:02 +0200 |
| commit | bba0f5924fa9478d41903331a3285f117c112731 (patch) | |
| tree | 9e7c0d70d7c9ddf36d4e72a92439dc0ecb852cb2 /lib/ssl/src/ssl.appup.src | |
| parent | 794c7616a5627fde16b954ffc609149e41429a9f (diff) | |
| parent | 96da2a50c90fcad84a8776f8c1dac008a6b24b39 (diff) | |
| download | otp-bba0f5924fa9478d41903331a3285f117c112731.tar.gz otp-bba0f5924fa9478d41903331a3285f117c112731.tar.bz2 otp-bba0f5924fa9478d41903331a3285f117c112731.zip | |
Merge branch 'raimo/gen_statem-callback_mode/OTP-13752' into maint
* raimo/gen_statem-callback_mode/OTP-13752:
ssl: Upgrade suite testing skipped if stdlib upgrade is required
Fix version numbers and dependencies
Conflicts:
lib/ssl/src/ssl.appup.src
lib/ssl/vsn.mk
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index fadc67ef80..22e24af0a8 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,24 +1,11 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"^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}]} + {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]}, + {<<"^[3-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}]} + {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]}, + {<<"^[3-7][.][^.].*">>, [{restart_application, ssl}]} ] }. - |