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

Merge pull request #16334 from thatch45/outputters_fix

Browse Source 
Fix the outputters, broken by @jacksontj
This commit is contained in:
Thomas S Hatch 2014-10-02 14:19:00 -06:00
commit b5e885362f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/client/__init__.py
View File

@ -869,7 +869,7 @@ class LocalClient(object):
else:
found.add(raw['data']['id'])
ret = {raw['data']['id']: {'ret': raw['data']['return']}}
if 'out' in raw:
if 'out' in raw['data']:
ret[raw['data']['id']]['out'] = raw['data']['out']
log.debug('jid {0} return from {1}'.format(jid, raw['data']['id']))
yield ret