aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-09-10 11:08:45 +0200
committerIngela Anderton Andin <[email protected]>2014-09-10 11:08:45 +0200
commit8f521bb86067e79a0fd25e25648001122f5c02a8 (patch)
tree1b3b7e294e381238af661a238e14d46b1f3b7170
parent709a304876b53ed941a45aed48b43744818e1224 (diff)
parent79da320fdd113ba0b16041c1472c156af4be0744 (diff)
downloadotp-8f521bb86067e79a0fd25e25648001122f5c02a8.tar.gz
otp-8f521bb86067e79a0fd25e25648001122f5c02a8.tar.bz2
otp-8f521bb86067e79a0fd25e25648001122f5c02a8.zip
Merge branch 'ia/inets/appup' into maint
-rw-r--r--lib/inets/src/inets_app/inets.appup.src8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 6991fb6d04..4bc49e1e67 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -17,6 +17,10 @@
%% %CopyrightEnd%
{"%VSN%",
[
+ {"5.10.2",
+ [
+ {load_module, httpd_request_handler, soft_purge, soft_purge,
+ []}]},
{"5.10.1",
[{load_module, httpc_handler, soft_purge, soft_purge, []},
{load_module, httpd, soft_purge, soft_purge, []},
@@ -34,6 +38,10 @@
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
+ {"5.10.2",
+ [
+ {load_module, httpd_request_handler, soft_purge, soft_purge,
+ []}]},
{"5.10.1",
[{load_module, httpc_handler, soft_purge, soft_purge, []},
{load_module, httpd, soft_purge, soft_purge, []},