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

Revert regression caused by #15848

Browse Source
This commit is contained in:
Mike Place 2015-03-19 16:52:43 -06:00 committed by rallytime
parent 5292f5d68d
commit 3782251ac6
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/minion.py
View File

@ -966,10 +966,6 @@ class Minion(MinionBase):
# python needs to be able to reconstruct the reference on the other # python needs to be able to reconstruct the reference on the other
# side. # side.
instance = self instance = self
# If we are running in multi-master mode, re-inject opts into module funcs
if instance.opts.get('multimaster', False):
for func in instance.functions:
sys.modules[instance.functions[func].__module__].__opts__ = self.opts
if self.opts['multiprocessing']: if self.opts['multiprocessing']:
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
# let python reconstruct the minion on the other side if we're # let python reconstruct the minion on the other side if we're