diff options
| author | Patrik Nyblom <[email protected]> | 2011-03-25 15:00:42 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-03-25 15:00:42 +0100 |
| commit | 4d8c2a57bbaebacff9e22cfa144d009789f140c6 (patch) | |
| tree | 327cf292cf06c52fad268ecd94e03f4ead557f3a /erts/etc | |
| parent | 7b8821f51620ed3cf93b6ca35e9650ced713ab85 (diff) | |
| parent | 9cd782e0751294250fced1574c512586f2d1b98f (diff) | |
| download | otp-4d8c2a57bbaebacff9e22cfa144d009789f140c6.tar.gz otp-4d8c2a57bbaebacff9e22cfa144d009789f140c6.tar.bz2 otp-4d8c2a57bbaebacff9e22cfa144d009789f140c6.zip | |
Merge branch 'pan/tcp_send_timeout/OTP-9145' into dev
* pan/tcp_send_timeout/OTP-9145:
Add testcase
Teach tcp_recv not to cancel send timer
Diffstat (limited to 'erts/etc')
0 files changed, 0 insertions, 0 deletions