aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-14 12:42:12 +0200
committerIngela Anderton Andin <[email protected]>2016-06-14 12:42:12 +0200
commit704ad32027d4a0b31deb9c61037679b1d0527caa (patch)
treebd99c3cef6728b160ef2e351bb2f1733bc5c52c7 /otp_build
parent481ac2a246c53c29033648ae5adda2c215fcc924 (diff)
parentd40e751d3e1edf979209587e0609c3825d66f7c0 (diff)
downloadotp-704ad32027d4a0b31deb9c61037679b1d0527caa.tar.gz
otp-704ad32027d4a0b31deb9c61037679b1d0527caa.tar.bz2
otp-704ad32027d4a0b31deb9c61037679b1d0527caa.zip
Merge branch 'ingela/ssl/ssl_basic_SUITE-timeouts'
* ingela/ssl/ssl_basic_SUITE-timeouts: ssl: Tune timeouts
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions