diff options
author | Micael Karlberg <[email protected]> | 2011-06-28 16:51:30 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-06-28 16:51:30 +0200 |
commit | 7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7 (patch) | |
tree | 720d872abcb4354492d3c957b1c8a64990fda12f /lib/inets/src/inets_app/inets.appup.src | |
parent | 80afe2b50aa5479e1e53dd7ba01e540df6351781 (diff) | |
parent | 9cb4040e4aeed40a52f174a7c4d9106e38572605 (diff) | |
download | otp-7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7.tar.gz otp-7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7.tar.bz2 otp-7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7.zip |
Merge branch 'maint-r14' into dev
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
-rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 18 |
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} |