diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-11 07:24:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-11 07:24:02 +0000 |
| commit | 7db2ae9eadeb2943c0e4f076a95b60190c4437aa (patch) | |
| tree | 551d7220dae3fb66695e7790652b9c4a81b4df0d | |
| parent | 4579e037b971e789273082c4b42538ffa666e89e (diff) | |
| parent | 264dd160e8de30a64148bb1b9fc24b6547dd5aae (diff) | |
| download | trove-7db2ae9eadeb2943c0e4f076a95b60190c4437aa.tar.gz | |
Merge "Updated from global requirements" into stable/juno2014.2.3
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index e9c19be7..04f28da2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ python-cinderclient>=1.1.0,<=1.1.1 python-keystoneclient>=0.10.0,<=1.1.0 python-swiftclient>=2.2.0,<=2.3.1 python-designateclient>=1.0.0,<=1.1.1 -python-neutronclient>=2.3.6,<3 +python-neutronclient>=2.3.6,<2.4.0 iso8601>=0.1.9,<=0.1.10 jsonschema>=2.0.0,<3.0.0 Jinja2<=2.7.2 diff --git a/test-requirements.txt b/test-requirements.txt index 7e9b5c38..4cdd1075 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,12 +12,12 @@ nosexcover openstack-doc-tools>=0.18.1 openstack.nose_plugin>=0.7 WebTest>=2.0,<=2.0.18 -wsgi_intercept>=0.6.1 # MIT License +wsgi_intercept>=0.6.1,<=0.9.1 # MIT License proboscis==1.2.5.3 http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.gz#egg=python-troveclient -mock>=1.0 -mox3>=0.7.0 +mock>=1.0,<=1.0.1 +mox3>=0.7.0,<=0.7.0 testtools>=0.9.34,!=1.4.0,<=1.5.0 -discover +discover<=0.4.0 testrepository>=0.0.18,<=0.0.20 |