aboutsummaryrefslogtreecommitdiffstats
path: root/erts/prebuild.skip
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-06-16 11:25:46 +0200
committerIngela Anderton Andin <[email protected]>2011-06-16 11:25:46 +0200
commite4dc4ebdb3ff9af89584987832bbdc06fcbf8c3a (patch)
tree123ba889368cac3b6a9176ce0df1d2ca4ddd70bf /erts/prebuild.skip
parentd4761d4c6247e0ae3864228b84bee0fb8a0db01b (diff)
parent3aa0bcebe8e71db8351cbeb16212d2bda6596327 (diff)
downloadotp-e4dc4ebdb3ff9af89584987832bbdc06fcbf8c3a.tar.gz
otp-e4dc4ebdb3ff9af89584987832bbdc06fcbf8c3a.tar.bz2
otp-e4dc4ebdb3ff9af89584987832bbdc06fcbf8c3a.zip
Merge branch 'ia/ssl/longer-timeout-in-testcase' into dev
* ia/ssl/longer-timeout-in-testcase: Time out in test case needs to be longer to make sure clean up is properly executed
Diffstat (limited to 'erts/prebuild.skip')
0 files changed, 0 insertions, 0 deletions