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 #23180 from jfindlay/remote_event

Browse source 
fix typos from 36841bdd in masterapi.py
This commit is contained in:
Thomas S Hatch 2015-04-30 08:22:41 -07:00
commit 34206f7ae3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/daemons/masterapi.py
View file

@ -713,9 +713,9 @@ class RemoteFuncs(object):
self.event.fire_event(event, event['tag']) # old dup event
if load.get('pretag') is not None:
if 'data' in event:
self.fire_event(event['data'], tagify(event['tag'], base=load['pretag']))
self.event.fire_event(event['data'], tagify(event['tag'], base=load['pretag']))
else:
self.fire_event(event, tagify(event['tag'], base=load['pretag']))
self.event.fire_event(event, tagify(event['tag'], base=load['pretag']))
else:
tag = load['tag']
self.event.fire_event(load, tag)