diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-30 20:25:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-30 20:25:22 +0000 |
| commit | 8470618611829338e3cd46f008b388e9866ea422 (patch) | |
| tree | fa608dd0bc530561aaafadabe9a8e14c5211ea95 | |
| parent | 4e44f1206fbc6438000dca327b20524c8a24b01b (diff) | |
| parent | dfea25d70c6cdc7f10aa2fd5a348d7071ded3d32 (diff) | |
| download | python-openstackclient-8470618611829338e3cd46f008b388e9866ea422.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index 62bcfe38..e2874062 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,6 @@ oslo.utils>=3.5.0 # Apache-2.0 python-glanceclient>=2.0.0 # Apache-2.0 python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 -python-cinderclient!=1.7.0,>=1.6.0 # Apache-2.0 +python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0 requests>=2.10.0 # Apache-2.0 stevedore>=1.10.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index ffc83260..a8d6aa47 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,14 +5,14 @@ hacking<0.11,>=0.10.0 coverage>=3.6 # Apache-2.0 discover # BSD -fixtures<2.0,>=1.3.1 # Apache-2.0/BSD -mock>=1.2 # BSD +fixtures>=3.0.0 # Apache-2.0/BSD +mock>=2.0 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 reno>=1.6.2 # Apache2 requests-mock>=0.7.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD -os-testr>=0.4.1 # Apache-2.0 +os-testr>=0.7.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT tempest>=11.0.0 # Apache-2.0 |