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

Merge pull request #27053 from rallytime/bp-26992

Browse Source 
Back-port #26992 to 2015.5
This commit is contained in:
Justin Findlay 2015-09-11 16:29:30 -06:00
commit 0227e1cb57
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/cli/salt.py
View File

@ -207,7 +207,7 @@ class SaltCMD(parsers.SaltCMDOptionParser):
ret_, out, retcode = self._format_ret(full_ret) ret_, out, retcode = self._format_ret(full_ret)
retcodes.append(retcode) retcodes.append(retcode)
self._output_ret(ret_, out) self._output_ret(ret_, out)
ret.update(ret_) ret.update(full_ret)
except KeyError: except KeyError:
errors.append(full_ret) errors.append(full_ret)