Merge "Remove workaround for eventlet bug #592"
This commit is contained in:
commit
90c711f1dd
@ -17,11 +17,5 @@ import eventlet
|
||||
import oslo_i18n as i18n
|
||||
|
||||
eventlet.monkey_patch()
|
||||
# Monkey patch the original current_thread to use the up-to-date _active
|
||||
# global variable. See https://bugs.launchpad.net/bugs/1863021 and
|
||||
# https://github.com/eventlet/eventlet/issues/592
|
||||
import __original_module_threading as orig_threading # noqa
|
||||
import threading # noqa
|
||||
orig_threading.current_thread.__globals__['_active'] = threading._active
|
||||
|
||||
i18n.install('cyborg')
|
||||
|
@ -5,7 +5,7 @@
|
||||
pbr>=0.11,!=2.1.0 # Apache-2.0
|
||||
pecan>=1.0.0,!=1.0.2,!=1.0.3,!=1.0.4,!=1.2 # BSD
|
||||
WSME>=0.10.1 # MIT
|
||||
eventlet>=0.26.0 # MIT
|
||||
eventlet>=0.27.0 # MIT
|
||||
oslo.i18n>=1.5.0 # Apache-2.0
|
||||
oslo.config>=1.1.0,!=4.3.0,!=4.4.0 # Apache-2.0
|
||||
oslo.log>=5.0.0 # Apache-2.0
|
||||
|
Loading…
Reference in New Issue
Block a user