aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-13 15:25:12 +0200
committerHans Nilsson <[email protected]>2015-10-13 15:25:12 +0200
commit308de032b8cb291e5fcd80ba2e0a21f260161511 (patch)
treed8c7c6957bb0c13721976d572e834fd9c8d728cb
parent60be19014474a39d9b611ef7749bffa1f6096bc1 (diff)
parent93a49adc5a174a034bba0431f1e8119a1f30dec6 (diff)
downloadotp-308de032b8cb291e5fcd80ba2e0a21f260161511.tar.gz
otp-308de032b8cb291e5fcd80ba2e0a21f260161511.tar.bz2
otp-308de032b8cb291e5fcd80ba2e0a21f260161511.zip
Merge branch 'hans/ssh/cuddle_spec' into maint
-rw-r--r--lib/ssh/src/ssh.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 132de71aed..15591fb4a7 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -117,9 +117,9 @@ channel_info(ConnectionRef, ChannelId, Options) ->
ssh_connection_handler:channel_info(ConnectionRef, ChannelId, Options).
%%--------------------------------------------------------------------
--spec daemon(integer()) -> {ok, pid()}.
--spec daemon(integer(), proplists:proplist()) -> {ok, pid()}.
--spec daemon(any | inet:ip_address(), integer(), proplists:proplist()) -> {ok, pid()}.
+-spec daemon(integer()) -> {ok, pid()} | {error, term()}.
+-spec daemon(integer(), proplists:proplist()) -> {ok, pid()} | {error, term()}.
+-spec daemon(any | inet:ip_address(), integer(), proplists:proplist()) -> {ok, pid()} | {error, term()}.
%% Description: Starts a server listening for SSH connections
%% on the given port.