aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/inets.appup.src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-03-06 11:35:53 +0100
committerMicael Karlberg <[email protected]>2012-03-06 11:35:53 +0100
commit96a9bdbb00a710b416d3cab4614d6ae37bb9b359 (patch)
tree602cffdeb684a44f3749c00d0f3fcf92db84b623 /lib/inets/src/inets_app/inets.appup.src
parentc864dc812dc853e101714185b56295a3f314ed01 (diff)
parent7b9b7c1cc416b0d5b1f2d5223ca5e012ddce0ea7 (diff)
downloadotp-96a9bdbb00a710b416d3cab4614d6ae37bb9b359.tar.gz
otp-96a9bdbb00a710b416d3cab4614d6ae37bb9b359.tar.bz2
otp-96a9bdbb00a710b416d3cab4614d6ae37bb9b359.zip
Merge branch 'jn/inets_sup_start_link' into bmk/inets/inets59_integration2
Also updated appup file accordingly.
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 3bc7d69101..d36fcf87d4 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -20,6 +20,9 @@
[
{"5.8.1",
[
+ {load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
+ {update, inets_sup, soft, soft_purge, soft_purge, []},
+
{load_module, httpd_conf, soft_purge, soft_purge, []},
{load_module, httpd_response, soft_purge, soft_purge, []},
{load_module, httpd_script_env, soft_purge, soft_purge, []},
@@ -32,6 +35,9 @@
},
{"5.8",
[
+ {load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
+ {update, inets_sup, soft, soft_purge, soft_purge, []},
+
{load_module, inets, soft_purge, soft_purge, [inets_trace]},
{load_module, httpd_conf, soft_purge, soft_purge, []},
@@ -57,6 +63,9 @@
[
{"5.8.1",
[
+ {load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
+ {update, inets_sup, soft, soft_purge, soft_purge, []},
+
{load_module, httpd_conf, soft_purge, soft_purge, []},
{load_module, httpd_response, soft_purge, soft_purge, []},
{load_module, httpd_script_env, soft_purge, soft_purge, []},
@@ -69,6 +78,9 @@
},
{"5.8",
[
+ {load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
+ {update, inets_sup, soft, soft_purge, soft_purge, []},
+
{load_module, inets, soft_purge, soft_purge, []},
{load_module, httpd_conf, soft_purge, soft_purge, []},