Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-05-08 13:15:20 +00:00 committed by Gerrit Code Review
commit 92b2a3edd7
2 changed files with 10 additions and 2 deletions

View File

@ -15,11 +15,11 @@ python-ceilometerclient>=1.0.6
python-cinderclient>=1.0.6
python-glanceclient>=0.9.0
python-heatclient>=0.2.3
python-keystoneclient>=0.7.0
python-keystoneclient>=0.8.0
python-neutronclient>=2.3.4,<3
python-novaclient>=2.17.0
python-saharaclient>=0.6.0
python-swiftclient>=1.6
python-troveclient>=1.0.3
python-troveclient>=1.0.4
pytz>=2010h
six>=1.6.0

View File

@ -17,6 +17,14 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup(
setup_requires=['pbr'],
pbr=True)