aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-05-27 16:55:33 +0200
committerIngela Anderton Andin <[email protected]>2014-05-27 16:55:33 +0200
commit95ffa9b741631752633b3c97dfcd1ce620574e94 (patch)
tree922e18f279ded1d25995e05e94a52c9b73f62799 /lib/ssh/test
parent339b6416664c7dc64d72c21653138137e8d1018f (diff)
parentdeacab96d83ad6432afbcba54cf2e372395008e5 (diff)
downloadotp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.gz
otp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.bz2
otp-95ffa9b741631752633b3c97dfcd1ce620574e94.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION lib/ssh/test/ssh_basic_SUITE.erl lib/ssh/vsn.mk
Diffstat (limited to 'lib/ssh/test')
-rw-r--r--lib/ssh/test/ssh_basic_SUITE.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 37a307d783..ba38c1da40 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -49,6 +49,7 @@ all() ->
server_userpassword_option,
double_close,
ssh_connect_timeout,
+ ssh_connect_arg4_timeout,
{group, hardening_tests}
].