Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-06-19 01:05:27 +00:00 committed by Gerrit Code Review
commit cd5f089559
4 changed files with 8 additions and 8 deletions

View File

@ -8,14 +8,14 @@ netaddr>=0.7.6
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
Paste Paste
Routes>=1.12.3 Routes>=1.12.3
six>=1.6.0 six>=1.7.0
SQLAlchemy>=0.7.8,<=0.9.99 SQLAlchemy>=0.7.8,<=0.9.99
sqlalchemy-migrate>=0.9.1 sqlalchemy-migrate>=0.9.1
passlib passlib
lxml>=2.3 lxml>=2.3
iso8601>=0.1.9 iso8601>=0.1.9
python-keystoneclient>=0.9.0 python-keystoneclient>=0.9.0
oslo.config>=1.2.0 oslo.config>=1.2.1
# oslo.messaging tries to pull in eventlet # oslo.messaging tries to pull in eventlet
# oslo.messaging>=1.3.0a4 # oslo.messaging>=1.3.0a4
Babel>=1.3 Babel>=1.3

View File

@ -7,14 +7,14 @@ netaddr>=0.7.6
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
Paste Paste
Routes>=1.12.3 Routes>=1.12.3
six>=1.6.0 six>=1.7.0
SQLAlchemy>=0.7.8,<=0.9.99 SQLAlchemy>=0.7.8,<=0.9.99
sqlalchemy-migrate>=0.9.1 sqlalchemy-migrate>=0.9.1
passlib passlib
lxml>=2.3 lxml>=2.3
iso8601>=0.1.9 iso8601>=0.1.9
python-keystoneclient>=0.9.0 python-keystoneclient>=0.9.0
oslo.config>=1.2.0 oslo.config>=1.2.1
oslo.messaging>=1.3.0 oslo.messaging>=1.3.0
Babel>=1.3 Babel>=1.3
oauthlib>=0.6 oauthlib>=0.6

View File

@ -9,7 +9,7 @@ hacking>=0.8.0,<0.9
# python-memcached>=1.48 # python-memcached>=1.48
# Optional dogpile backend: MongoDB # Optional dogpile backend: MongoDB
pymongo>=2.4 pymongo>=2.5
# python-ldap does not install on py3 # python-ldap does not install on py3
# authenticate against an existing LDAP server # authenticate against an existing LDAP server
@ -24,7 +24,7 @@ fixtures>=0.3.14
mock>=1.0 mock>=1.0
oslotest oslotest
# required to build documentation # required to build documentation
sphinx>=1.2.1,<1.3 sphinx>=1.1.2,!=1.2.0,<1.3
# test wsgi apps without starting an http server # test wsgi apps without starting an http server
WebTest>=2.0 WebTest>=2.0

View File

@ -7,7 +7,7 @@ pysqlite
python-memcached>=1.48 python-memcached>=1.48
# Optional dogpile backend: MongoDB # Optional dogpile backend: MongoDB
pymongo>=2.4 pymongo>=2.5
# Optional backend: LDAP # Optional backend: LDAP
# authenticate against an existing LDAP server # authenticate against an existing LDAP server
@ -22,7 +22,7 @@ fixtures>=0.3.14
mock>=1.0 mock>=1.0
oslotest oslotest
# required to build documentation # required to build documentation
sphinx>=1.2.1,<1.3 sphinx>=1.1.2,!=1.2.0,<1.3
# test wsgi apps without starting an http server # test wsgi apps without starting an http server
WebTest>=2.0 WebTest>=2.0