Merge pull request #24780 from nmadhok/backport-2014.7-24777

Backporting PR #24777 to 2014.7 branch
This commit is contained in:
Mike Place 2015-06-18 08:52:56 -06:00
commit 4281dfff0b

View File

@ -170,7 +170,8 @@ class Batch(object):
parts[minion]['ret'] = {}
for minion, data in parts.items():
active.remove(minion)
if minion in active:
active.remove(minion)
if self.opts.get('raw'):
yield data
else: