Merge branch 'develop' into azurefs

This commit is contained in:
Mike Place 2017-10-03 09:09:35 -06:00 committed by GitHub
commit aeea10f2b9

View File

@ -970,7 +970,7 @@ class Minion(MinionBase):
# Flag meaning minion has finished initialization including first connect to the master. # Flag meaning minion has finished initialization including first connect to the master.
# True means the Minion is fully functional and ready to handle events. # True means the Minion is fully functional and ready to handle events.
self.ready = False self.ready = False
self.jid_queue = jid_queue self.jid_queue = jid_queue or []
if io_loop is None: if io_loop is None:
if HAS_ZMQ: if HAS_ZMQ: