openstack/cinder
Code Issues Proposed changes

Merge "Copy the RHEL6 eventlet workaround from Oslo"

Browse Source
This commit is contained in:
Jenkins 2013-05-09 05:34:06 +00:00 committed by Gerrit Code Review
commit 116493092c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/redhat-eventlet.patch
View File

@ -1,7 +1,7 @@
--- .cinder-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py.orig --- .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py.orig
2011-05-25 2011-05-25
23:31:34.597271402 +0000 23:31:34.597271402 +0000
+++ .cinder-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py +++ .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py
2011-05-25 2011-05-25
23:33:24.055602468 +0000 23:33:24.055602468 +0000
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@

2
openstack-common.conf
View File

@ -15,8 +15,10 @@ module=lockutils
module=log module=log
module=network_utils module=network_utils
module=notifier module=notifier
module=patch_tox_venv
module=policy module=policy
module=processutils module=processutils
module=redhat-eventlet.patch
module=rootwrap module=rootwrap
module=rpc module=rpc
module=scheduler module=scheduler

2
tools/patch_tox_venv.py
View File

@ -28,7 +28,7 @@ def main(argv):
pip_requires = os.path.join(root, 'tools', 'pip-requires') pip_requires = os.path.join(root, 'tools', 'pip-requires')
test_requires = os.path.join(root, 'tools', 'test-requires') test_requires = os.path.join(root, 'tools', 'test-requires')
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
project = 'Cinder' project = 'cinder'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
py_version, project) py_version, project)
#NOTE(dprince): For Tox we only run post_process (which patches files, etc) #NOTE(dprince): For Tox we only run post_process (which patches files, etc)