Merge pull request #24778 from nmadhok/backport-2015.2-24777

Backporting PR #24777 to 2015.2 branch
This commit is contained in:
Mike Place 2015-06-18 08:53:04 -06:00
commit 39f088a74c

View file

@ -176,7 +176,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: