diff options
| author | Raimo Niskanen <[email protected]> | 2019-02-15 13:25:23 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-15 13:25:23 +0100 |
| commit | 9b93a26e8bda8b5e5bb9cd0a1925d3a2d435cb6c (patch) | |
| tree | 1cad7c34641151a2182a9175af59e1c6298a465a /erts/preloaded/src/Makefile | |
| parent | 595c159823089d0186ec2617c174356d1ff2de65 (diff) | |
| parent | e23b1ad7f296ae18cae143cdafcdaff044cee9f3 (diff) | |
| download | otp-9b93a26e8bda8b5e5bb9cd0a1925d3a2d435cb6c.tar.gz otp-9b93a26e8bda8b5e5bb9cd0a1925d3a2d435cb6c.tar.bz2 otp-9b93a26e8bda8b5e5bb9cd0a1925d3a2d435cb6c.zip | |
Merge branch 'raimo/erts/gen_tcp-listen-linger-slow/ERIERL-303/OTP-14728' into maint
* raimo/erts/gen_tcp-listen-linger-slow/ERIERL-303/OTP-14728:
Check empty_out_q at close also for linger
Conflicts:
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'erts/preloaded/src/Makefile')
0 files changed, 0 insertions, 0 deletions