diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:36:00 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:36:00 +0100 |
| commit | e1430adbefd18b7e7b6c5e3509caad8d6450b21e (patch) | |
| tree | e7f67a29eaf7a85076ef1ac97ae1277c602e5cd1 /lib/ssl/src/ssl.appup.src | |
| parent | 453934c7f240c1105088a63b8c4bb24e191c8b81 (diff) | |
| parent | 62238bdab1c035388d83bdfb670ee178c6f3f448 (diff) | |
| download | otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.tar.gz otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.tar.bz2 otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 11728128c4..057906bcb3 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,9 @@ %% -*- erlang -*- {"%VSN%", [ + {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []}, + {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []} + ]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, {<<"5\\..*">>, [{restart_application, ssl}]}, @@ -8,6 +11,9 @@ {<<"3\\..*">>, [{restart_application, ssl}]} ], [ + {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []}, + {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []} + ]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, {<<"5\\..*">>, [{restart_application, ssl}]}, |