diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-20 17:32:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-20 17:32:21 +0000 |
| commit | 492e3bd9dc2ffd403b60876e060901659475b287 (patch) | |
| tree | c5b68bc68e89d01eb2e503b18edb0815fea1115d | |
| parent | b00e34428cc2650b13bdfda43549ce60616afe05 (diff) | |
| parent | 98a33de54dccd5ed4f12d9c59414bc797d8fb6f5 (diff) | |
| download | python-ceilometerclient-492e3bd9dc2ffd403b60876e060901659475b287.tar.gz | |
Merge "Updated from global requirements" into stable/kilo
| -rw-r--r-- | requirements.txt | 12 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt index bfafab6..22d73a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,11 @@ pbr>=0.6,!=0.7,<1.0 argparse iso8601>=0.1.9 -oslo.i18n>=1.3.0 # Apache-2.0 -oslo.serialization>=1.2.0 # Apache-2.0 -oslo.utils>=1.2.0 # Apache-2.0 +oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 +oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 +oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 PrettyTable>=0.7,<0.8 -python-keystoneclient>=1.1.0 +python-keystoneclient>=1.1.0,<1.4.0 requests>=2.2.0,!=2.4.0 -six>=1.7.0 -stevedore>=1.1.0 # Apache-2.0 +six>=1.9.0 +stevedore>=1.3.0,<1.4.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6dffed5..882cebb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,7 @@ coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -oslosphinx>=2.2.0 # Apache-2.0 +oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 testrepository>=0.0.18 |