diff options
| author | Micael Karlberg <[email protected]> | 2012-01-23 14:09:22 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-23 14:09:22 +0100 |
| commit | 7e6ac31a0c918f42e747628db8fec610f5bd424c (patch) | |
| tree | 4294a95a34fdec1e28504bd90230f15a2816e106 /lib/inets/src/inets_app/inets.appup.src | |
| parent | efe40df70999f798590cdbfd6648375891aa0ab0 (diff) | |
| parent | a8af5a6bae97ddd7bfc2bcff2e701fa37f47640c (diff) | |
| download | otp-7e6ac31a0c918f42e747628db8fec610f5bd424c.tar.gz otp-7e6ac31a0c918f42e747628db8fec610f5bd424c.tar.bz2 otp-7e6ac31a0c918f42e747628db8fec610f5bd424c.zip | |
Merge branch 'maint-r15' into maint
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 779dd8e439..e80cb2a23b 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -1,7 +1,7 @@ %% This is an -*- erlang -*- file. %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2011. All Rights Reserved. +%% Copyright Ericsson AB 1999-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -18,6 +18,15 @@ {"%VSN%", [ + {"5.8", + [ + {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} @@ -40,6 +49,15 @@ } ], [ + {"5.8", + [ + {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} |