aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/ebin
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-05-12 10:02:57 +0200
committerIngela Anderton Andin <[email protected]>2014-05-12 10:02:57 +0200
commit441c5a4dbc01e33db11b9497c14927da1af896f6 (patch)
tree6cb5ca8a67bac193f266e839681ab31f607d3c78 /erts/preloaded/ebin
parent3b85eee9540b49936d203978369c2a5d7bdd24c4 (diff)
parentc80735b0c82ec0bbaa2e2bda4f1598210b193556 (diff)
downloadotp-441c5a4dbc01e33db11b9497c14927da1af896f6.tar.gz
otp-441c5a4dbc01e33db11b9497c14927da1af896f6.tar.bz2
otp-441c5a4dbc01e33db11b9497c14927da1af896f6.zip
Merge branch 'ia/ssl/inherit/OTP-11897' into maint
* ia/ssl/inherit/OTP-11897: ssl: Handle socket option inheritance when pooling of accept sockets is used
Diffstat (limited to 'erts/preloaded/ebin')
0 files changed, 0 insertions, 0 deletions