aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/gen_tcp.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-01-21 15:41:31 +0100
committerIngela Anderton Andin <[email protected]>2014-01-21 15:41:31 +0100
commit744984833cc1a51f51781e3417db7f152eeab4ae (patch)
tree48a2c08a403d830755e19fc7e2bb452d44f584dd /lib/kernel/src/gen_tcp.erl
parent41db1e8520171908b3ebc4ecd1d09d83dd4dc535 (diff)
parent44c4ecd8bad76c1ecc2eae2d23ebf212f1c299b9 (diff)
downloadotp-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/kernel/src/gen_tcp.erl')
0 files changed, 0 insertions, 0 deletions