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

Remove debug statement.

Browse source
This commit is contained in:
C. R. Oldham 2015-10-07 08:01:07 -06:00
parent 02fc2d9323
commit b79b6a39dd
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/minion.py
View file

@ -2536,7 +2536,11 @@ class ProxyMinion(Minion):
proxy_init_fn = self.proxy[fq_proxyname+'.init']
proxy_init_fn(self.opts)
self.opts['grains'] = salt.loader.grains(self.opts)
# reload ?!?
# Check config 'add_proxymodule_to_opts' Remove this in Boron.
if config['add_proxymodule_to_opts']:
self.opts['proxymodule'] = self.proxy
self.serial = salt.payload.Serial(self.opts)
self.mod_opts = self._prep_mod_opts()
self.matcher = Matcher(self.opts, self.functions)

1
salt/modules/rest_service.py
View file

@ -41,7 +41,6 @@ def get_all():
salt '*' service.get_all
'''
proxy_fn = 'rest_sample.service_list'
log.debug(__salt__['test.arg'](1,2,3))
return __proxy__[proxy_fn]()