diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-06-15 00:17:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-06-15 00:17:45 +0000 |
| commit | 5c2d9f386b99c04b2d9683d658d952473885b9a8 (patch) | |
| tree | b61dd4801ba6f531d415e988d04ce9f708774eb3 | |
| parent | 0da5bfe42875457a26a0c5040fcc3b0e1ffb5d2a (diff) | |
| parent | 5805596013435835842f9b050485f554e8758a02 (diff) | |
| download | python-openstackclient-5c2d9f386b99c04b2d9683d658d952473885b9a8.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index 122d8896..422b4a01 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ cliff>=1.4.3 keyring>=2.1 pycrypto>=2.6 python-glanceclient>=0.9.0 -python-keystoneclient>=0.8.0 +python-keystoneclient>=0.9.0 python-novaclient>=2.17.0 python-cinderclient>=1.0.6 requests>=1.1 diff --git a/test-requirements.txt b/test-requirements.txt index 7e1fa06b..1b872c3b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,10 +1,10 @@ -hacking>=0.8.0,<0.9 +hacking>=0.9.1,<0.10 coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,<1.3 testrepository>=0.0.18 testtools>=0.9.34 WebOb>=1.2.3 |