saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33912 from abalashov/abalashov/fix-schedule-returner-config

Browse source 
utils/schedule.py:handle_func() - Fix for accessing returner configur…
This commit is contained in:
Mike Place 2016-06-13 10:18:04 -07:00 • committed by GitHub
commit 8d8ed59b85
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/utils/schedule.py
View file

@ -719,10 +719,10 @@ class Schedule(object):
data_returner = data.get('returner', None)
if data_returner or self.schedule_returner:
if 'returner_config' in data:
ret['ret_config'] = data['returner_config']
if 'returner_kwargs' in data:
ret['ret_kwargs'] = data['returner_kwargs']
if 'return_config' in data:
ret['ret_config'] = data['return_config']
if 'return_kwargs' in data:
ret['ret_kwargs'] = data['return_kwargs']
rets = []
for returner in [data_returner, self.schedule_returner]:
if isinstance(returner, str):