diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-12 21:52:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-12 21:52:07 +0000 |
| commit | 36212c43d880d0eaeb3df271cccb314802bf3372 (patch) | |
| tree | 02aeaa3a463a60944ef48cf2192acfe5382069a8 | |
| parent | 49c74229b4073b1572357b074e78e2c4674632e7 (diff) | |
| parent | 7b046f951131a94cb3c345cd03a0bb5220720522 (diff) | |
| download | python-openstackclient-36212c43d880d0eaeb3df271cccb314802bf3372.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index c1afc70f..2bbe09d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,10 +7,10 @@ oslo.i18n>=1.0.0 # Apache-2.0 oslo.utils>=1.0.0 # Apache-2.0 pbr>=0.6,!=0.7,<1.0 python-glanceclient>=0.14.0 -python-keystoneclient>=0.10.0 +python-keystoneclient>=0.11.1 python-novaclient>=2.18.0 python-cinderclient>=1.1.0 python-neutronclient>=2.3.6,<3 -requests>=1.2.1,!=2.4.0 +requests>=2.2.0,!=2.4.0 six>=1.7.0 -stevedore>=1.0.0 +stevedore>=1.0.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 50ddc88e..1bd4efb8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,7 @@ fixtures>=0.3.14 mock>=1.0 oslosphinx>=2.2.0 # Apache-2.0 requests-mock>=0.4.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,<1.3 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 testrepository>=0.0.18 testtools>=0.9.34 WebOb>=1.2.3 |