valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15056 from dmyerscough/fix-ssh-timeout

Browse Source 
Fix #14981 ssh timeout
This commit is contained in:
Thomas S Hatch 2014-08-19 16:27:23 -06:00
commit 84da7fd57e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/client/__init__.py
View File

@ -1446,7 +1446,8 @@ class SSHClient(object):
''' '''
opts = copy.deepcopy(self.opts) opts = copy.deepcopy(self.opts)
opts.update(kwargs) opts.update(kwargs)
opts['timeout'] = timeout if timeout:
opts['timeout'] = timeout
arg = salt.utils.args.condition_input(arg, kwarg) arg = salt.utils.args.condition_input(arg, kwarg)
opts['argv'] = [fun] + arg opts['argv'] = [fun] + arg
opts['selected_target_option'] = expr_form opts['selected_target_option'] = expr_form