diff options
| author | Henrik Nord <[email protected]> | 2016-04-27 10:38:50 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-04-27 10:38:50 +0200 |
| commit | 0ad440a44a799be9b2943c82197cb808cddba87d (patch) | |
| tree | 40850a1b7d3c9b4b4aedc08e3d6b6336a965a553 /lib/inets/src/inets_app/inets.appup.src | |
| parent | 75fa8578cb847c15a10360523ecdbaabf507128d (diff) | |
| parent | fea24ae8d37b33e97ef1897d0d3b6cdb2338c051 (diff) | |
| download | otp-0ad440a44a799be9b2943c82197cb808cddba87d.tar.gz otp-0ad440a44a799be9b2943c82197cb808cddba87d.tar.bz2 otp-0ad440a44a799be9b2943c82197cb808cddba87d.zip | |
Merge branch 'maint-18'
Conflicts:
OTP_VERSION
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl_cipher.erl
lib/ssl/src/tls_v1.erl
lib/ssl/test/ssl_basic_SUITE.erl
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 4d0d656acb..a603357ebd 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,12 +18,16 @@ %% %CopyrightEnd% {"%VSN%", [ - {<<"6.2">>, [{load_module, httpc, soft_purge, soft_purge, []}]}, + {<<"6.2.1">>, [{load_module, httpd_script_env, soft_purge, soft_purge, []}]}, + {<<"6.2">>, [{load_module, httpd_script_env, soft_purge, soft_purge, []}, + {load_module, httpc, soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ - {<<"6.2">>, [{load_module, httpc, soft_purge, soft_purge, []}]}, + {<<"6.2.1">>, [{load_module, httpd_script_env, soft_purge, soft_purge, []}]}, + {<<"6.2">>, [{load_module, httpd_script_env, soft_purge, soft_purge, []}, + {load_module, httpc, soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] |