aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2014-01-28 15:09:35 +0100
committerHans Nilsson <[email protected]>2014-01-28 15:09:35 +0100
commitdc7eeae35b5a9e23a08584605e71c4007dfd74ee (patch)
treeb5db58006d3c7f676105310074d7961e8952b127 /lib/ssh/src
parent6de916efa8df952ca1e24cccda673134982c0da0 (diff)
parent9ec3ad0d292a5b89a332cb24ed2246a3bfdf9443 (diff)
downloadotp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.tar.gz
otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.tar.bz2
otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.zip
Merge branch 'master' of super:otp
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 2685b1553b..9f571adba2 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -59,8 +59,8 @@ stop() ->
application:stop(ssh).
%%--------------------------------------------------------------------
--spec connect(string(), integer(), proplists:proplists()) -> {ok, pid()} | {error, term()}.
--spec connect(string(), integer(), proplists:proplists(), timeout()) -> {ok, pid()} | {error, term()}.
+-spec connect(string(), integer(), proplists:proplist()) -> {ok, pid()} | {error, term()}.
+-spec connect(string(), integer(), proplists:proplist(), timeout()) -> {ok, pid()} | {error, term()}.
%%
%% Description: Starts an ssh connection.
%%--------------------------------------------------------------------