diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-20 11:34:07 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-20 11:34:07 +0200 |
| commit | 8a84e8ec16df01fcd37e61f2cf22c4b17178507a (patch) | |
| tree | 6922b713e4dfa5ae2753893efc033d23093e42fc /lib/ssl/src/ssl.appup.src | |
| parent | 9d5aa4ee276c142e9800262333103be5da600a53 (diff) | |
| parent | 4efe89d8e2ef1eca4ebccf7e753839e52b08daa4 (diff) | |
| download | otp-8a84e8ec16df01fcd37e61f2cf22c4b17178507a.tar.gz otp-8a84e8ec16df01fcd37e61f2cf22c4b17178507a.tar.bz2 otp-8a84e8ec16df01fcd37e61f2cf22c4b17178507a.zip | |
Merge branch 'ia/ssl/soft-upgrade' into maint
* ia/ssl/soft-upgrade:
ssl: Correct soft upgrade test
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index c95326941c..8d5bd6f8d8 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,7 +1,7 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"7.0">>, [{load_module, ssl, soft_purge, soft_purge, []}, + {<<"7\\.0">>, [{load_module, ssl, soft_purge, soft_purge, []}, {load_module, ssl_connection, soft_purge, soft_purge, []}, {load_module, tls_connection, soft_purge, soft_purge, []}, {load_module, ssl_session, soft_purge, soft_purge, []}, @@ -13,7 +13,7 @@ {<<"3\\..*">>, [{restart_application, ssl}]} ], [ - {<<"7.0">>, [{load_module, ssl, soft_purge, soft_purge, []}, + {<<"7\\.0">>, [{load_module, ssl, soft_purge, soft_purge, []}, {load_module, ssl_connection, soft_purge, soft_purge, []}, {load_module, tls_connection, soft_purge, soft_purge, []}, {load_module, ssl_session, soft_purge, soft_purge, []}, |