Merge pull request #20305 from rallytime/bp-20216

Backport #20216 to 2014.7
This commit is contained in:
Thomas S Hatch 2015-02-03 05:55:24 -07:00
commit 8ed1daba67

View File

@ -270,6 +270,8 @@ class SaltCMD(parsers.SaltCMDOptionParser):
if isinstance(ret, str):
self.exit(2, '{0}\n'.format(ret))
for host in ret:
if ret[host] == 'Minion did not return. [Not connected]':
continue
for fun in ret[host]:
if fun not in docs:
if ret[host][fun]: