aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-31 15:36:55 +0200
committerIngela Anderton Andin <[email protected]>2016-05-31 15:36:55 +0200
commitd4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d (patch)
tree69cbe3a1899f08644ef745c311dcfd45699cdf3c /erts
parent78b50b543395f9af748e2b00afb8c0266e708514 (diff)
parent9420a3f8abbc66e073b370613cfb7f218b97818b (diff)
downloadotp-d4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d.tar.gz
otp-d4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d.tar.bz2
otp-d4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d.zip
Merge branch 'ingela/ssl/test-timeouts'
* ingela/ssl/test-timeouts: ssl: Increase timeouts due to slow test machines
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions