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

Merge remote-tracking branch 'upstream/develop' into unify-api

Browse Source
This commit is contained in:
Samuel M Smith 2013-08-12 11:38:04 -06:00
commit f038dc48b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/master.py
View File

@ -1868,7 +1868,7 @@ class ClearFuncs(object):
log.warning('Authentication failure of type "token" occurred.')
return ''
good = self.ckminions.wheel_check(
self.opts['external_auth'][clear_load['eauth']][token['name']] if token['name'] in self.opts['external_auth'][clear_load['eauth']] else self.opts['external_auth'][token['eauth']]['*'],
self.opts['external_auth'][token['eauth']][token['name']] if token['name'] in self.opts['external_auth'][token['eauth']] else self.opts['external_auth'][token['eauth']]['*'],
clear_load['fun'])
if not good:
msg = ('Authentication failure of type "eauth" occurred for '

2
salt/runner.py
View File

@ -85,7 +85,7 @@ class RunnerClient(object):
to watch for the return
'''
tag = '{0:%Y%m%d%H%M%S%f}'.format(datetime.datetime.now())
tag[20] = 'r'
tag = tag = '{0}r'.format(tag[:-1])
proc = multiprocessing.Process(
target=self._proc_runner,
args=(tag, fun, low))