diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-27 16:55:33 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-27 16:55:33 +0200 |
| commit | 95ffa9b741631752633b3c97dfcd1ce620574e94 (patch) | |
| tree | 922e18f279ded1d25995e05e94a52c9b73f62799 /lib/inets/src/inets_app | |
| parent | 339b6416664c7dc64d72c21653138137e8d1018f (diff) | |
| parent | deacab96d83ad6432afbcba54cf2e372395008e5 (diff) | |
| download | otp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.gz otp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.bz2 otp-95ffa9b741631752633b3c97dfcd1ce620574e94.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
lib/ssh/test/ssh_basic_SUITE.erl
lib/ssh/vsn.mk
Diffstat (limited to 'lib/inets/src/inets_app')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index dd081962cc..5499596bbd 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -17,11 +17,20 @@ %% %CopyrightEnd% {"%VSN%", [ - {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]}, + {"5.10", + [{load_module, httpd, soft_purge, soft_purge, []}, + {load_module, httpd_manager, soft_purge, soft_purge, []}, + {load_module, httpd_request, soft_purge, soft_purge, []}, + {load_module, httpd_request_handler, soft_purge, soft_purge, + []}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ - {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]}, + {"5.10", + [{load_module, httpd, soft_purge, soft_purge, []}, + {load_module, httpd_manager, soft_purge, soft_purge, []}, + {load_module, httpd_request, soft_purge, soft_purge, []}, + {load_module, httpd_request_handler, soft_purge, soft_purge, []}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] }. |