diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 04:34:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 04:34:30 +0000 |
| commit | 128dbdedd527de22d5e61a21d214b02a5af7b27c (patch) | |
| tree | f08767c82fe8a7a69f999d5c51fac81e79139ee5 | |
| parent | 7091358fa93ea27a3eeb02f2f2e154956becf70c (diff) | |
| parent | 579a065c0dcce554a5dca86164eb8f1d6fb43c4d (diff) | |
| download | keystone-128dbdedd527de22d5e61a21d214b02a5af7b27c.tar.gz | |
Merge "Updated from global requirements" into stable/kilo
| -rw-r--r-- | requirements-py3.txt | 4 | ||||
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements-py3.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt index 1f1c16b45..3780d5fa1 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -16,8 +16,8 @@ SQLAlchemy>=0.9.7,<=0.9.99 sqlalchemy-migrate>=0.9.5 passlib iso8601>=0.1.9 -python-keystoneclient>=1.1.0 -keystonemiddleware>=1.5.0 +python-keystoneclient>=1.1.0,<1.4.0 +keystonemiddleware>=1.5.0,<1.6.0 oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 oslo.config>=1.9.3,<1.10.0 # Apache-2.0 # oslo.messaging tries to pull in eventlet diff --git a/requirements.txt b/requirements.txt index ed8684e9d..87e136642 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,8 +16,8 @@ SQLAlchemy>=0.9.7,<=0.9.99 sqlalchemy-migrate>=0.9.5 passlib iso8601>=0.1.9 -python-keystoneclient>=1.1.0 -keystonemiddleware>=1.5.0 +python-keystoneclient>=1.1.0,<1.4.0 +keystonemiddleware>=1.5.0,<1.6.0 oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 oslo.config>=1.9.3,<1.10.0 # Apache-2.0 oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 @@ -32,6 +32,6 @@ oauthlib>=0.6 pysaml2 dogpile.cache>=0.5.3 jsonschema>=2.0.0,<3.0.0 -pycadf>=0.8.0 +pycadf>=0.8.0,<0.9.0 posix_ipc msgpack-python>=0.4.0 diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt index 5e60aa940..c29a82035 100644 --- a/test-requirements-py3.txt +++ b/test-requirements-py3.txt @@ -14,7 +14,7 @@ bashate>=0.2 # Apache-2.0 # python-memcached>=1.48 # Optional dogpile backend: MongoDB -pymongo>=2.6.3 +pymongo>=2.6.3,<3.0 # Optional backend: LDAP # python-ldap does not install on py3 diff --git a/test-requirements.txt b/test-requirements.txt index ea80cb162..ace34704b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,7 +12,7 @@ pysqlite python-memcached>=1.48 # Optional dogpile backend: MongoDB -pymongo>=2.6.3 +pymongo>=2.6.3,<3.0 # Optional backend: LDAP # authenticate against an existing LDAP server |