diff options
author | Björn-Egil Dahlberg <[email protected]> | 2012-12-06 15:02:30 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2012-12-06 15:02:30 +0100 |
commit | 214d1aaf4749ae6a7bb0506cf448551a312a9a58 (patch) | |
tree | 380065f3e00e8cd3de49f155a9db41ceb6c6a68b /erts/emulator | |
parent | af68f5a22f995284b07ece178c42e630ecf94d54 (diff) | |
parent | 2eb32af0fdd74bb4d61f952fbd96e548bb916eb1 (diff) | |
download | otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.tar.gz otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.tar.bz2 otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.zip |
Merge tag 'erl_1218' into maint
ssl: Patch 1218
OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions