aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-11 11:50:45 +0100
committerIngela Anderton Andin <[email protected]>2018-01-11 11:50:45 +0100
commite9b753a03b7f0edc6f795e9c05cd3cca41c2011e (patch)
tree5c3df396e1fc6ce049c01a0328adc7f12a94e87f /erts
parentdf8499995b4994d3f85f4b80fc3c2cf941a99cdc (diff)
parentf4b1cfb4b0e750664d56f1a842a4bde09f18b6f9 (diff)
downloadotp-e9b753a03b7f0edc6f795e9c05cd3cca41c2011e.tar.gz
otp-e9b753a03b7f0edc6f795e9c05cd3cca41c2011e.tar.bz2
otp-e9b753a03b7f0edc6f795e9c05cd3cca41c2011e.zip
Merge branch 'ingela/ssl/timeout-cuddle' into maint
* ingela/ssl/timeout-cuddle: ssl: Tune timeouts
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions