diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-09 09:06:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-09 09:06:37 +0000 |
| commit | 761317e540878ab21434acced2326b8bd6987a8f (patch) | |
| tree | 8dc8675e76655e08c17ee1ef1e312a822ac8abcd | |
| parent | 2068f2d18b4841c56c9626e10c5c9b907b0ab668 (diff) | |
| parent | 6e3da8a952cc9a52f375cb70e01e27e8a71c1fff (diff) | |
| download | neutron-761317e540878ab21434acced2326b8bd6987a8f.tar.gz | |
Merge "Updated from global requirements" into proposed/juno
| -rw-r--r-- | requirements.txt | 12 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/requirements.txt b/requirements.txt index cb31cee1dd..9e7eac56b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ iso8601>=0.1.9 jsonrpclib Jinja2 keystonemiddleware>=1.0.0 -kombu>=2.4.8 +kombu>=2.5.0 netaddr>=0.7.12 python-neutronclient>=2.3.6,<3 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99 @@ -25,10 +25,10 @@ WebOb>=1.2.3 python-keystoneclient>=0.10.0 alembic>=0.6.4 six>=1.7.0 -stevedore>=0.14 -oslo.config>=1.4.0.0a3 -oslo.db>=0.4.0 # Apache-2.0 -oslo.messaging>=1.4.0.0a3 -oslo.rootwrap>=1.3.0.0a1 +stevedore>=1.0.0 # Apache-2.0 +oslo.config>=1.4.0 # Apache-2.0 +oslo.db>=1.0.0 # Apache-2.0 +oslo.messaging>=1.4.0 +oslo.rootwrap>=1.3.0 python-novaclient>=2.18.0 diff --git a/test-requirements.txt b/test-requirements.txt index aa8596daf4..2943af4aae 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. hacking>=0.9.2,<0.10 -cliff>=1.6.0 +cliff>=1.7.0 # Apache-2.0 coverage>=3.6 discover fixtures>=0.3.14 @@ -12,7 +12,7 @@ python-subunit>=0.0.18 ordereddict requests-mock>=0.4.0 # Apache-2.0 sphinx>=1.1.2,!=1.2.0,<1.3 -oslosphinx>=2.2.0.0a2 +oslosphinx>=2.2.0 # Apache-2.0 testrepository>=0.0.18 testtools>=0.9.34 WebTest>=2.0 |