aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-08-25 15:36:18 +0200
committerHans Nilsson <[email protected]>2015-08-25 15:36:18 +0200
commit49d30519579afcdf15807dd6635b962831b55fc5 (patch)
tree93d9c3634cedcde2b81f3d5bf80c380d1a045e68 /erts
parent4d51ad280e5bdfe270bca772476e2e029520a2b2 (diff)
parentbc28d2308209ffc7cec0218028fc62b88a413f0f (diff)
downloadotp-49d30519579afcdf15807dd6635b962831b55fc5.tar.gz
otp-49d30519579afcdf15807dd6635b962831b55fc5.tar.bz2
otp-49d30519579afcdf15807dd6635b962831b55fc5.zip
Merge branch 'hans/ssh/prolong_short_timetrap' into maint
* hans/ssh/prolong_short_timetrap: ssh: doubled short timetrap in testcase
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions