aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/inets.appup.src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-07-12 11:04:54 +0200
committerMicael Karlberg <[email protected]>2011-07-12 11:04:54 +0200
commit4cc5cf4b6bdb0f689b666fe007d2e1f0f1a5838a (patch)
tree91ac07f0809ccf770c07d184b07560b94b786fc3 /lib/inets/src/inets_app/inets.appup.src
parent1c01cf2fb625e105dd2355279635edbb3dbb3063 (diff)
parent32fc16e311bfbc5abd0ab8caf64d566e1e65196d (diff)
downloadotp-4cc5cf4b6bdb0f689b666fe007d2e1f0f1a5838a.tar.gz
otp-4cc5cf4b6bdb0f689b666fe007d2e1f0f1a5838a.tar.bz2
otp-4cc5cf4b6bdb0f689b666fe007d2e1f0f1a5838a.zip
Merge branch 'maint-r14' of super:otp into maint-r14
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src18
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 47f3fbba58..8b0fcb185d 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,6 +18,15 @@
{"%VSN%",
[
+ {"5.6",
+ [
+ {load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
+ {load_module, http_transport, soft_purge, soft_purge, [http_transport]},
+ {update, httpc_handler, soft, soft_purge, soft_purge, []},
+ {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]},
+ {update, ftp, soft, soft_purge, soft_purge, []}
+ ]
+ },
{"5.5.2",
[
{restart_application, inets}
@@ -40,6 +49,15 @@
}
],
[
+ {"5.6",
+ [
+ {load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
+ {load_module, http_transport, soft_purge, soft_purge, [http_transport]},
+ {update, httpc_handler, soft, soft_purge, soft_purge, []},
+ {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]},
+ {update, ftp, soft, soft_purge, soft_purge, []}
+ ]
+ },
{"5.5.2",
[
{restart_application, inets}