mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
fix merge wart
This commit is contained in:
parent
c695e0bcff
commit
df17505fed
1 changed files with 1 additions and 1 deletions
|
@ -2529,7 +2529,7 @@ class Minion(MinionBase):
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@salt.ext.tornado.gen.coroutine
|
@tornado.gen.coroutine
|
||||||
def _fire_master_minion_start(self):
|
def _fire_master_minion_start(self):
|
||||||
include_grains = False
|
include_grains = False
|
||||||
if self.opts["start_event_grains"]:
|
if self.opts["start_event_grains"]:
|
||||||
|
|
Loading…
Add table
Reference in a new issue