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 remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

Browse source 
Conflicts:
     salt/master.py
This commit is contained in:
Colton Myers 2015-08-17 15:55:55 -06:00
commit dafed10a9e
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/master.py
View file

@ -20,6 +20,7 @@ import resource
import multiprocessing
import sys
import tempfile
import traceback
# Import third party libs
import zmq
@ -2143,9 +2144,6 @@ class ClearFuncs(object):
clear_load['groups'] = groups
return self.loadauth.mk_token(clear_load)
except Exception as exc:
import sys
import traceback
type_, value_, traceback_ = sys.exc_info()
log.error(
'Exception occurred while authenticating: {0}'.format(exc)
@ -2322,9 +2320,6 @@ class ClearFuncs(object):
return ''
except Exception as exc:
import sys
import traceback
type_, value_, traceback_ = sys.exc_info()
log.error(
'Exception occurred while authenticating: {0}'.format(exc)