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

Merge pull request #26409 from basepi/merge-forward-2015.5

Browse Source 
[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Colton Myers 2015-08-17 17:19:56 -06:00
commit c5eb6bbd3e
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)