Merge pull request #18521 from thatch45/gate_zmq

gate zmq!
This commit is contained in:
Thomas S Hatch 2014-11-26 11:56:16 -07:00
commit 96b35c5548

View File

@ -14,7 +14,6 @@ import os
import logging
from threading import Thread, Event
import multiprocessing
import zmq
import signal
# Import salt libs
import salt.log
@ -26,6 +25,13 @@ import salt.payload
from salt.exceptions import SaltException
import salt.config
# Import third party libs
try:
import zmq
HAS_ZMQ = True
except ImportError:
HAS_ZMQ = False
log = logging.getLogger(__name__)