diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-27 16:56:58 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-27 16:56:58 +0200 |
| commit | dea5de2c705248802cb234e02aa7402b52d3bb54 (patch) | |
| tree | 94e4a343b8bad22a85f94876598401742fb87e34 /lib/ssh/test | |
| parent | 7276e2502bfa097be81443c9785d59d06f4d0df4 (diff) | |
| parent | 95ffa9b741631752633b3c97dfcd1ce620574e94 (diff) | |
| download | otp-dea5de2c705248802cb234e02aa7402b52d3bb54.tar.gz otp-dea5de2c705248802cb234e02aa7402b52d3bb54.tar.bz2 otp-dea5de2c705248802cb234e02aa7402b52d3bb54.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/test')
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 3 |
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} ]. |