diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-09-13 00:53:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-09-13 00:53:32 +0000 |
commit | 38db7fcd2a59b5d508c05b5576c465e7f3547803 (patch) | |
tree | e15751cd06ead44f1bffdf0ad3d20399056969e4 | |
parent | 51f93febd421310ad3d2e9cccb2d718485b1942a (diff) | |
parent | 6c37ccb427f00500598c71189ab38b0c2f71f3c7 (diff) | |
download | python-saharaclient-38db7fcd2a59b5d508c05b5576c465e7f3547803.tar.gz |
Merge "Updated from global requirements"
-rw-r--r-- | requirements.txt | 6 | ||||
-rw-r--r-- | test-requirements.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index 6b77d39..8c57107 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,10 +5,10 @@ pbr>=0.6,!=0.7,<1.0 Babel>=1.3 -netaddr>=0.7.6 -oslo.i18n>=0.1.0 # Apache-2.0 +netaddr>=0.7.12 +oslo.i18n>=0.3.0 # Apache-2.0 python-keystoneclient>=0.10.0 -requests>=1.2.1 +requests>=1.2.1,!=2.4.0 six>=1.7.0 PrettyTable>=0.7,<0.8 argparse diff --git a/test-requirements.txt b/test-requirements.txt index 730675b..884bdce 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,10 +6,10 @@ hacking>=0.9.2,<0.10 coverage>=3.6 mock>=1.0 discover -oslosphinx +oslosphinx>=2.2.0.0a2 testrepository>=0.0.18 sphinx>=1.1.2,!=1.2.0,<1.3 python-swiftclient>=2.2.0 -python-novaclient>=2.17.0 +python-novaclient>=2.18.0 python-neutronclient>=2.3.6,<3 oslo.config>=1.4.0.0a3 |