diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-29 01:25:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-29 01:25:54 +0000 |
| commit | 8e87c0b600d0742fbdd69ab770dbeb9dca7cf58c (patch) | |
| tree | 01ecbdfba4d61003aeddcae9a1100f643759fe29 | |
| parent | 7bd8eb2aacae499a957c54bb953bad3c722b0c7d (diff) | |
| parent | dc8e21da3d0c49c000a4e049c385c9cab19dd6c1 (diff) | |
| download | python-cinderclient-8e87c0b600d0742fbdd69ab770dbeb9dca7cf58c.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 9accb4f..f3bbb83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ pbr>=0.6,!=0.7,<1.0 argparse PrettyTable>=0.7,<0.8 -python-keystoneclient>=0.9.0 -requests>=1.1 -simplejson>=2.0.9 +python-keystoneclient>=0.10.0 +requests>=1.2.1 +simplejson>=2.2.0 Babel>=1.3 six>=1.7.0 diff --git a/test-requirements.txt b/test-requirements.txt index 40cc8cd..ae55f81 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,9 +4,9 @@ coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -oslosphinx +oslosphinx>=2.2.0.0a2 python-subunit>=0.0.18 -requests-mock>=0.4.0 +requests-mock>=0.4.0 # Apache-2.0 sphinx>=1.1.2,!=1.2.0,<1.3 testtools>=0.9.34 testrepository>=0.0.18 |