aboutsummaryrefslogtreecommitdiffstats
path: root/erts/.gitignore
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-10-14 16:17:48 +0200
committerIngela Anderton Andin <[email protected]>2016-10-14 16:17:48 +0200
commit74adb848a89eb9eb4be52e8d46e1c07e52e65f20 (patch)
treec6d08322b44f35c82f75e73405635fa1e8b74d46 /erts/.gitignore
parentdf8c6690a86d087d8de324276b2266bc5918c779 (diff)
parent309f17c4e95d51dac0c87f9faa419f96ea303dee (diff)
downloadotp-74adb848a89eb9eb4be52e8d46e1c07e52e65f20.tar.gz
otp-74adb848a89eb9eb4be52e8d46e1c07e52e65f20.tar.bz2
otp-74adb848a89eb9eb4be52e8d46e1c07e52e65f20.zip
Merge branch 'ingela/ssl/tune-timeouts-basic_SUITE' into maint
* ingela/ssl/tune-timeouts-basic_SUITE: ssl: Tune timeout for old solaris machine
Diffstat (limited to 'erts/.gitignore')
0 files changed, 0 insertions, 0 deletions