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

Merge pull request #21822 from basepi/bp-21820

Browse Source 
[2014.7] Backport #21820 to 2014.7
This commit is contained in:
Thomas S Hatch 2015-03-19 14:39:21 -06:00
commit f92fd17d46
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/master.py
View File

@ -1187,7 +1187,7 @@ class AESFuncs(object):
# if we have a load, save it # if we have a load, save it
if load.get('load'): if load.get('load'):
fstr = '{0}.save_load'.format(self.opts['master_job_cache']) fstr = '{0}.save_load'.format(self.opts['master_job_cache'])
self.mminion.returners[fstr](load['jid'], load) self.mminion.returners[fstr](load['jid'], load['load'])
# Format individual return loads # Format individual return loads
for key, item in load['return'].items(): for key, item in load['return'].items():