diff options
| author | Hans Nilsson <[email protected]> | 2017-02-20 12:31:37 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-02-20 12:31:37 +0100 |
| commit | 24ce55b30fdf4debb914b4f9e228ca70d7a593c2 (patch) | |
| tree | 936f164df6cc0126e3aa7422f4d3b9ae654b4293 /lib | |
| parent | cb99d72e175e02e281309373d55b161a77ffabed (diff) | |
| parent | 5d8a3ae82e6c6cac43b02e2fee238446167db14a (diff) | |
| download | otp-24ce55b30fdf4debb914b4f9e228ca70d7a593c2.tar.gz otp-24ce55b30fdf4debb914b4f9e228ca70d7a593c2.tar.bz2 otp-24ce55b30fdf4debb914b4f9e228ca70d7a593c2.zip | |
Merge branch '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 425b4d20f2..4d5e5be2a1 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 |