aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-09-10 11:09:58 +0200
committerIngela Anderton Andin <[email protected]>2014-09-10 11:09:58 +0200
commit89aa1c791f9a6775b4d452f7725791dbdcbc3876 (patch)
tree8cee1dc536def647fdf1d4a5e52600928a324b3b
parent6eee97087053868159fb07541cfe62154e4973f1 (diff)
parent8f521bb86067e79a0fd25e25648001122f5c02a8 (diff)
downloadotp-89aa1c791f9a6775b4d452f7725791dbdcbc3876.tar.gz
otp-89aa1c791f9a6775b4d452f7725791dbdcbc3876.tar.bz2
otp-89aa1c791f9a6775b4d452f7725791dbdcbc3876.zip
Merge branch '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, []},