aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2018-03-06 10:47:09 +0100
committerPéter Dimitrov <[email protected]>2018-03-06 10:47:09 +0100
commitb8b3abfacb40d147ec834cc18742b356d6b03236 (patch)
tree446a418d65b26f0b28ef0bab772b392493a7f57f /lib/inets/src/inets_app
parent84a2ed39f035dd1a569dca370dc11876993c6ecf (diff)
parenta9c87dbf7e5cb0ac50424bde9cd53772e7b77292 (diff)
downloadotp-b8b3abfacb40d147ec834cc18742b356d6b03236.tar.gz
otp-b8b3abfacb40d147ec834cc18742b356d6b03236.tar.bz2
otp-b8b3abfacb40d147ec834cc18742b356d6b03236.zip
Merge branch 'peterdmv/inets/unix_domain_socket/OTP-14854' into maint
* peterdmv/inets/unix_domain_socket/OTP-14854: inets: Prepare for release inets: Skip http_unix_socket test group on Windows inets: Add unix domain socket support to httpc Change-Id: I680e41463849a9d79add1385ec2703267be8754c
Diffstat (limited to 'lib/inets/src/inets_app')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index e24a4a8694..a86413147c 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,14 +18,10 @@
%% %CopyrightEnd%
{"%VSN%",
[
- {<<"6.4.5">>, [{load_module, httpc_handler,
- soft_purge, soft_purge, []}]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
- {<<"6.4.5">>, [{load_module, httpc_handler,
- soft_purge, soft_purge, []}]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
]