diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:41:31 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:41:31 +0100 |
| commit | 744984833cc1a51f51781e3417db7f152eeab4ae (patch) | |
| tree | 48a2c08a403d830755e19fc7e2bb452d44f584dd /lib/inets/src/inets_app/inets.app.src | |
| parent | 41db1e8520171908b3ebc4ecd1d09d83dd4dc535 (diff) | |
| parent | 44c4ecd8bad76c1ecc2eae2d23ebf212f1c299b9 (diff) | |
| download | otp-744984833cc1a51f51781e3417db7f152eeab4ae.tar.gz otp-744984833cc1a51f51781e3417db7f152eeab4ae.tar.bz2 otp-744984833cc1a51f51781e3417db7f152eeab4ae.zip | |
Merge branch 'ia/inets/httpd-manager-improvments/OTP-11557' into maint
* ia/inets/httpd-manager-improvments/OTP-11557:
inets: Prepare for release
inets: Remove log message as it causes more harm than use at the moment
inets: Mend broken max_clients check
inets: Start CT'ify httpd_SUITE
inets: Remove use of default gen_server timeout
Diffstat (limited to 'lib/inets/src/inets_app/inets.app.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.app.src | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src index 4aea2ef3d7..a6dd364c2d 100644 --- a/lib/inets/src/inets_app/inets.app.src +++ b/lib/inets/src/inets_app/inets.app.src @@ -1,7 +1,7 @@ %% This is an -*- erlang -*- file. %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2014. 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 @@ -59,6 +59,7 @@ httpd_acceptor, httpd_acceptor_sup, httpd_cgi, + httpd_connection_sup, httpd_conf, httpd_esi, httpd_example, |