aboutsummaryrefslogtreecommitdiffstats
path: root/erl-build-tool-vars.sh
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-06-29 09:42:07 +0200
committerIngela Anderton Andin <[email protected]>2017-06-29 09:42:07 +0200
commit4dbee101c93ed9498411a116e57919c7e17b077d (patch)
tree39b6d681a2a6c9b8ebcf89b3fe03b0870d5ae1eb /erl-build-tool-vars.sh
parentbbc8eb42959740930902b68d9a76fad424ca2e6a (diff)
parent32bd68aa22ace6f21306cff6e7fb35b8310fd105 (diff)
downloadotp-4dbee101c93ed9498411a116e57919c7e17b077d.tar.gz
otp-4dbee101c93ed9498411a116e57919c7e17b077d.tar.bz2
otp-4dbee101c93ed9498411a116e57919c7e17b077d.zip
Merge branch 'ingela/ssl/timeout-cuddle' into maint
* ingela/ssl/timeout-cuddle: ssl: Set rizzo* test timeout high enough for our slowest test machine
Diffstat (limited to 'erl-build-tool-vars.sh')
0 files changed, 0 insertions, 0 deletions