diff options
| author | Hans Nilsson <[email protected]> | 2015-02-05 10:55:54 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-02-05 10:55:54 +0100 |
| commit | 9f6f29e5c58ab9e39a4de3142c9670c925734130 (patch) | |
| tree | 4f11f92b8bc9b3c0f5618a11d1c0f47bd75eccaf /lib/ssh/src | |
| parent | ae5d5db20fe1d9b4cae2a19717ef010be1b8097f (diff) | |
| parent | 6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d (diff) | |
| download | otp-9f6f29e5c58ab9e39a4de3142c9670c925734130.tar.gz otp-9f6f29e5c58ab9e39a4de3142c9670c925734130.tar.bz2 otp-9f6f29e5c58ab9e39a4de3142c9670c925734130.zip | |
Merge branch 'maint'
* maint:
Fix ssh:connect erroneus error msg at timeout
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 915060c426..68523aa72b 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -1711,7 +1711,7 @@ handshake(Pid, Ref, Timeout) -> {error, Reason} after Timeout -> stop(Pid), - {error, Timeout} + {error, timeout} end. start_timeout(_,_, infinity) -> |