aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-05-25 12:43:29 +0200
committerHans Nilsson <[email protected]>2016-05-25 12:43:29 +0200
commit16e733bc6aa83bf0d2c86bcddb63095d9ed0cf3a (patch)
treeade2727892e6a72f67dfdd2e0a4db3d52f9cbd34 /erts/emulator
parent0941e2148388f8509301da7dc454004923823016 (diff)
parent5e236d05879260d3a2465dcb4cd6cf044f214161 (diff)
downloadotp-16e733bc6aa83bf0d2c86bcddb63095d9ed0cf3a.tar.gz
otp-16e733bc6aa83bf0d2c86bcddb63095d9ed0cf3a.tar.bz2
otp-16e733bc6aa83bf0d2c86bcddb63095d9ed0cf3a.zip
Merge branch 'hans/ssh/benchmark_crash'
* hans/ssh/benchmark_crash: ssh: Benchmark suite timeouts were to short
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions