diff options
| author | Micael Karlberg <[email protected]> | 2011-03-18 12:08:44 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-18 12:08:44 +0100 |
| commit | e343c5b24ca4d642f327e6ec57d63094b28b2838 (patch) | |
| tree | 2f86813124b3d6a3f1b44b732674cfd2dfa6509a /lib/inets/src/inets_app/inets.appup.src | |
| parent | 588a0d9c86b1b85a2cd7635460564ddaac566882 (diff) | |
| parent | 6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce (diff) | |
| download | otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.tar.gz otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.tar.bz2 otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.zip | |
Merge branch 'bmk/inets/ftp/missing_spec_causes_dialyxer_problems/OTP-9114' into bmk/inets/inet56_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 65ce0cf0eb..2d12353e00 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -20,6 +20,7 @@ [ {"5.5.2", [ + {load_module, ftp, soft_purge, soft_purge, []}, {load_module, httpc, soft_purge, soft_purge, [httpc_handler]}, {load_module, httpc_request, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]} @@ -27,6 +28,7 @@ }, {"5.5.1", [ + {load_module, ftp, soft_purge, soft_purge, []}, {load_module, http_chunk, soft_purge, soft_purge, []}, {load_module, httpc, soft_purge, soft_purge, [httpc_handler]}, {load_module, httpc_request, soft_purge, soft_purge, []}, @@ -48,6 +50,7 @@ [ {"5.5.2", [ + {load_module, ftp, soft_purge, soft_purge, []}, {load_module, httpc, soft_purge, soft_purge, [httpc_handler]}, {load_module, httpc_request, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]} @@ -55,6 +58,7 @@ }, {"5.5.1", [ + {load_module, ftp, soft_purge, soft_purge, []}, {load_module, http_chunk, soft_purge, soft_purge, []}, {load_module, httpc, soft_purge, soft_purge, [httpc_handler]}, {load_module, httpc_request, soft_purge, soft_purge, []}, |