commit 4bcf7e1002ca8468c713e0d4e4327bf91ad4ab61
author Zuul <zuul@review.openstack.org> Mon Mar 26 05:39:08 2018 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 26 05:39:08 2018 +0000
tree 39149273b43338fa396b51163c7e50f9dc6e22e7
parent f61e1e2870a672ca478225fffb97701e0f0f670d
parent 20b95386b77564c29fd0e034cf4d6d62a667d011

Merge "Updated from global requirements"

doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 597b54e..d959d44 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,4 +3,4 @@
 # process, which may cause wedges in the gate later.
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index a74042f..38f4a2a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@
 paramiko>=2.0.0 # LGPLv2.1+
 netaddr>=0.7.18 # BSD
 oslo.concurrency>=3.25.0 # Apache-2.0
-oslo.config>=5.1.0 # Apache-2.0
+oslo.config>=5.2.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0