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

Return the ret data from batch execution instead of raw data

Browse source 
Fixes #38604
This commit is contained in:
Erik Johnson 2017-01-10 15:20:55 -06:00
parent 7b850d472d
commit a642a995dc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/cli/batch.py
View file

@ -227,8 +227,8 @@ class Batch(object):
ret[minion] = data
yield data
else:
ret[minion] = data
yield {minion: data}
ret[minion] = data['ret']
yield {minion: data['ret']}
if not self.quiet:
ret[minion] = data['ret']
data[minion] = data.pop('ret')