diff options
| author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:55 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:55 +0200 |
| commit | 72f65b32bd479b4ebcba09d422ef3716f8cf9ff9 (patch) | |
| tree | d74928717e34e76480ab9e85e7f8bccd8c206953 /lib/inets/src/inets_app/inets.appup.src | |
| parent | 49d86a43c207f4825f7242f34a7cc8d3584993a7 (diff) | |
| parent | 4def16a1b087d082360b7cd5d0efe83ee38f0517 (diff) | |
| download | otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.tar.gz otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.tar.bz2 otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.zip | |
Merge branch 'ingela/inets/deprecated-inets_regexp/OTP-13533' into maint-18
* ingela/inets/deprecated-inets_regexp/OTP-13533:
inets: Prepare for release
inets: Put back inets_regexp module in OTP 18
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 73dba0c661..a9fbb1c3f7 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,16 +18,10 @@ %% %CopyrightEnd% {"%VSN%", [ - {<<"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.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}]} ] |