aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/inets.appup.src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-02-06 15:26:28 +0100
committerMicael Karlberg <[email protected]>2012-02-06 15:26:28 +0100
commitb2eeb740c6e013055603aaaee1570550d380b720 (patch)
treee332e7f1270c6de2103fc7d163999a27ba4e40e8 /lib/inets/src/inets_app/inets.appup.src
parentdcf35c1ef914f7473bb64fa9175af2cf42744885 (diff)
parent0d580acdc51bd88a0d364b76ac35fcf2506c2d9e (diff)
downloadotp-b2eeb740c6e013055603aaaee1570550d380b720.tar.gz
otp-b2eeb740c6e013055603aaaee1570550d380b720.tar.bz2
otp-b2eeb740c6e013055603aaaee1570550d380b720.zip
Merge branch 'bmk/inets/httpc/checking_ipv6_on_windows' into bmk/inets/inets59_integration
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src64
1 files changed, 21 insertions, 43 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index e80cb2a23b..f47ca98d1a 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,65 +18,43 @@
{"%VSN%",
[
+ {"5.8.1",
+ [
+ {load_module, inets, soft_purge, soft_purge, [inets_trace]},
+ {update, httpc_handler, soft, soft_purge, soft_purge, []},
+ {add_module, inets_trace}
+ ]
+ },
{"5.8",
[
+ {load_module, inets, soft_purge, soft_purge, [inets_trace]},
{load_module, ftp, soft_purge, soft_purge, []},
{update, httpc_handler, {advanced, upgrade_from_pre_5_8_1},
soft_purge, soft_purge, []},
{update, httpc_manager, {advanced, upgrade_from_pre_5_8_1},
- soft_purge, soft_purge, [httpc_handler]}
- ]
- },
- {"5.7.2",
- [
- {restart_application, inets}
- ]
- },
- {"5.7.1",
- [
- {restart_application, inets}
+ soft_purge, soft_purge, [httpc_handler]},
+ {add_module, inets_trace}
]
- },
- {"5.7",
+ }
+ ],
+ [
+ {"5.8.1",
[
- {restart_application, inets}
+ {load_module, inets, soft_purge, soft_purge, []},
+ {update, httpc_handler, soft, soft_purge, soft_purge, []},
+ {remove, {inets_trace, soft_purge, brutal_purge}}
]
},
- {"5.6",
- [
- {restart_application, inets}
- ]
- }
- ],
- [
{"5.8",
[
+ {load_module, inets, soft_purge, soft_purge, [inets_trace]},
{load_module, ftp, soft_purge, soft_purge, []},
{update, httpc_handler, {advanced, upgrade_from_pre_5_8_1},
soft_purge, soft_purge, []},
{update, httpc_manager, {advanced, upgrade_from_pre_5_8_1},
- soft_purge, soft_purge, [httpc_handler]}
- ]
- },
- {"5.7.2",
- [
- {restart_application, inets}
- ]
- },
- {"5.7.1",
- [
- {restart_application, inets}
- ]
- },
- {"5.7",
- [
- {restart_application, inets}
- ]
- },
- {"5.6",
- [
- {restart_application, inets}
+ soft_purge, soft_purge, [httpc_handler]},
+ {remove, {inets_trace, soft_purge, brutal_purge}}
]
- }
+ }
]
}.