aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-02-24 12:41:58 +0100
committerSiri Hansen <[email protected]>2014-02-24 12:41:58 +0100
commite2896b5f3922b8397024aee8f541d46ba5cb0f1d (patch)
treea14469ef59606b1cb4f9b9022ed3dc90c41eff40 /erts
parent287a235b3e2d15bb047967263af5246362c5fdd4 (diff)
parentae91a79057eaa48d93b182f285d122207c429753 (diff)
downloadotp-e2896b5f3922b8397024aee8f541d46ba5cb0f1d.tar.gz
otp-e2896b5f3922b8397024aee8f541d46ba5cb0f1d.tar.bz2
otp-e2896b5f3922b8397024aee8f541d46ba5cb0f1d.zip
Merge branch 'siri/master-cuddle-with-tests'
* siri/master-cuddle-with-tests: Use default timetrap (30 min) for kernel, stdlib and sasl app tests Unload 'deadlock' application in application_SUITE:shutdown_deadlock
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions