commit 78ebd5adba13717831d48bfe5ad9c0c15a63004f
author Zuul <zuul@review.openstack.org> Tue Mar 20 21:07:54 2018 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 20 21:07:54 2018 +0000
tree 26e977cc63563d169a523c5345d4743bfc2ef456
parent bff3438608fc15084a789163caf106cb488f48ea
parent cf28ac2dc13e9b5a5dd4395ea8fcc8f0d250ca52

Merge "Updated from global requirements"

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 77875ed..63cb933 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,8 +4,8 @@
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 neutron-lib>=1.13.0 # Apache-2.0
-oslo.config>=5.1.0 # Apache-2.0
-ipaddress>=1.0.16;python_version<'3.3' # PSF
+oslo.config>=5.2.0 # Apache-2.0
+ipaddress>=1.0.17;python_version<'3.3' # PSF
 netaddr>=0.7.18 # BSD
 oslo.log>=3.36.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0

test-requirements.txt

diff --git a/test-requirements.txt b/test-requirements.txt
index f4f8c0a..b8835e3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT