diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-16 22:45:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-16 22:45:50 +0000 |
| commit | c82875b1b48c670e9c76fcf3112bdfd4ca05fd2e (patch) | |
| tree | b86c30ef1030ce5d5b37c38c80e80d38cb2c0f6c | |
| parent | 35d937d1e2f4a296f3475479f31e83305f0a9ed1 (diff) | |
| parent | f0c8167a9b446b616d379c81709b7d3034dea4bd (diff) | |
| download | keystone-c82875b1b48c670e9c76fcf3112bdfd4ca05fd2e.tar.gz | |
Merge "Updated from global requirements" into stable/icehouse
| -rw-r--r-- | requirements.txt | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt index 51ac2fdae..f7ca50330 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,11 +13,11 @@ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2 passlib lxml>=2.3 iso8601>=0.1.9 -python-keystoneclient>=0.7.0 -oslo.config>=1.2.0 -oslo.messaging>=1.3.0 +python-keystoneclient>=0.7.0,<0.12 +oslo.config>=1.2.0,<1.5 +oslo.messaging>=1.3.0,<1.5 # only for Keystone tests running against keystoneclient master -oslo.serialization>=0.1.0 # Apache-2.0 +oslo.serialization>=0.1.0,<1.1 # Apache-2.0 Babel>=1.3 oauthlib>=0.6 dogpile.cache>=0.5.0 diff --git a/test-requirements.txt b/test-requirements.txt index c370f43ee..c429be95b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -29,7 +29,7 @@ WebTest>=2.0 discover python-subunit>=0.0.18 testrepository>=0.0.18 -testtools>=0.9.34 +testtools>=0.9.34,!=1.2.0,!=1.4.0 testscenarios>=0.4 # for python-keystoneclient @@ -45,4 +45,4 @@ oslosphinx # Used only by oslo kombu>=2.4.8 lockfile>=0.8 -stevedore>=0.14 +stevedore>=0.14,<1.2 |