diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-25 12:27:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-25 12:27:40 +0000 |
| commit | abdc388875051184c44dafc5437a9a46329848f8 (patch) | |
| tree | 9a8d6232e98a7d6d5a4fc7c2fed1b3149dc45c90 | |
| parent | f0c3b19165a5ca73ea8f1dc0ddaad290eee35039 (diff) | |
| parent | 511875dbce1f39584b00e6293b2bd4cd5d1b1868 (diff) | |
| download | neutron-8.0.0.0rc2.tar.gz | |
Merge "Updated from global requirements" into stable/mitaka8.0.0.0rc2
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index a1e0c2386e..2fefd7d091 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0 netaddr!=0.7.16,>=0.7.12 # BSD netifaces>=0.10.4 # MIT neutron-lib>=0.0.1 # Apache-2.0 -python-neutronclient>=2.6.0 # Apache-2.0 +python-neutronclient!=4.1.0,>=2.6.0 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 ryu>=3.30 # Apache-2.0 SQLAlchemy<1.1.0,>=1.0.10 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index abe6023dc3..4fb374a82b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 -cliff!=1.16.0,>=1.15.0 # Apache-2.0 +cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0 coverage>=3.6 # Apache-2.0 fixtures>=1.3.1 # Apache-2.0/BSD mock>=1.2 # BSD |