aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-05-27 13:42:17 +0200
committerErlang/OTP <[email protected]>2014-05-27 13:42:17 +0200
commitaa00b0090da89ca7442a5ff837e49a450638ce6a (patch)
tree091fdc0f9e10322a4c29e3562b0f3cda26adf38d /lib/inets
parente35e0db4d7527cebd14a655d7686c8c375d42f94 (diff)
parenta004919e744907ad70300df391eccc1fa72bc289 (diff)
downloadotp-aa00b0090da89ca7442a5ff837e49a450638ce6a.tar.gz
otp-aa00b0090da89ca7442a5ff837e49a450638ce6a.tar.bz2
otp-aa00b0090da89ca7442a5ff837e49a450638ce6a.zip
Merge branch 'ia/inets/prep' into maint-17
* ia/inets/prep: inets: Prepare for release
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src13
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index dd081962cc..5499596bbd 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -17,11 +17,20 @@
%% %CopyrightEnd%
{"%VSN%",
[
- {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]},
+ {"5.10",
+ [{load_module, httpd, soft_purge, soft_purge, []},
+ {load_module, httpd_manager, soft_purge, soft_purge, []},
+ {load_module, httpd_request, soft_purge, soft_purge, []},
+ {load_module, httpd_request_handler, soft_purge, soft_purge,
+ []}]},
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
- {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]},
+ {"5.10",
+ [{load_module, httpd, soft_purge, soft_purge, []},
+ {load_module, httpd_manager, soft_purge, soft_purge, []},
+ {load_module, httpd_request, soft_purge, soft_purge, []},
+ {load_module, httpd_request_handler, soft_purge, soft_purge, []}]},
{<<"5\\..*">>,[{restart_application, inets}]}
]
}.
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index cbcf0362c9..bbd86c3eb3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,6 +18,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 5.10
+INETS_VSN = 5.10.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"