summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-21 03:31:57 +0000
committerGerrit Code Review <review@openstack.org>2015-11-21 03:31:57 +0000
commit1fa346e8ba7671ecb1ad92575a146b7433c211d5 (patch)
tree58948df5fd79221b58ce4f601acf98530319deb1
parent7ab5dcf8ed8fadc45cfa0bce641776704cecf24a (diff)
parent682117f3ab96d2f24d7d7a5a8069f741d964f227 (diff)
downloadoslo-middleware-1fa346e8ba7671ecb1ad92575a146b7433c211d5.tar.gz
Merge "Updated from global requirements"
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index dcaba68..df4e05c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ pbr>=1.6
Babel>=1.3
Jinja2>=2.8 # BSD License (3 clause)
ordereddict
-oslo.config>=2.6.0 # Apache-2.0
+oslo.config>=2.7.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
oslo.utils>=2.8.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 0270deb..29dea5b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@
fixtures>=1.3.1
hacking<0.11,>=0.10.0
mock>=1.2
-oslosphinx>=2.5.0 # Apache-2.0
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
testtools>=1.4.0