saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

same thing for the mine in salt-ssh

Browse source
This commit is contained in:
Thomas S Hatch 2016-07-20 15:21:06 -06:00 • committed by rallytime
parent 3e11e19714
commit 9268a793de
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/client/ssh/wrapper/publish.py
View file

@ -72,7 +72,9 @@ def _publish(tgt,
arg = []
# Set up opts for the SSH object
opts = copy.deepcopy(__opts__)
opts = copy.deepcopy(__context__['master_opts'])
minopts = copy.deepcopy(__opts__)
opts.update(minopts)
if roster:
opts['roster'] = roster
if timeout: