diff options
| author | Hans Nilsson <[email protected]> | 2017-02-20 12:31:13 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-02-20 12:31:13 +0100 |
| commit | 5d8a3ae82e6c6cac43b02e2fee238446167db14a (patch) | |
| tree | 21e51de9d41523827b33b09b0854ddb8c156641e /lib | |
| parent | b7d70f859bffa136f658c433e209e4620be0d498 (diff) | |
| parent | e001bf6951b9a02d0a9a0c6ca1ea4f364713ac4c (diff) | |
| download | otp-5d8a3ae82e6c6cac43b02e2fee238446167db14a.tar.gz otp-5d8a3ae82e6c6cac43b02e2fee238446167db14a.tar.bz2 otp-5d8a3ae82e6c6cac43b02e2fee238446167db14a.zip | |
Merge branch 'hans/ssh/cuddle_tests' into maint
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 86c3d5de26..b6f4a7371d 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -36,7 +36,7 @@ %%-------------------------------------------------------------------- suite() -> - [{timetrap,{seconds,20}}]. + [{timetrap,{seconds,60}}]. all() -> case os:find_executable("ssh") of |