diff options
| author | Lukas Larsson <[email protected]> | 2016-08-09 10:10:30 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-08-09 10:10:30 +0200 |
| commit | 3dc416bb89e577c83e16c306fd4821da03681ab9 (patch) | |
| tree | e21e65d8519c359a8d1f89b261cfa68a3420f241 /lib/ssl/src/ssl.appup.src | |
| parent | 4e4081d091756e86c2d0dce3ccee4aa6fedbf531 (diff) | |
| parent | 1db9e32445dc368c6073e3b412567d81a2b5eeb2 (diff) | |
| download | otp-3dc416bb89e577c83e16c306fd4821da03681ab9.tar.gz otp-3dc416bb89e577c83e16c306fd4821da03681ab9.tar.bz2 otp-3dc416bb89e577c83e16c306fd4821da03681ab9.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index b6a6b00565..fadc67ef80 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,9 @@ %% -*- erlang -*- {"%VSN%", [ + {<<"^8[.]0$">>, + [{load_module, ssl_handshake, soft_purge, soft_purge, []} + ]}, {<<"^7[.][^.].*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, {<<"5\\..*">>, [{restart_application, ssl}]}, @@ -8,6 +11,9 @@ {<<"3\\..*">>, [{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}]}, @@ -15,3 +21,4 @@ {<<"3\\..*">>, [{restart_application, ssl}]} ] }. + |