From f6e4cdc15faec19ed8c9a2a76d4a21ac53ca6016 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 2 Nov 2016 22:02:20 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: If259654bfad87f61c0c4d0f223082d43c30b5dd0
---
 requirements.txt      | 4 ++--
 test-requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c434c87ec..02ddcc0b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ httplib2>=0.7.5 # MIT
 requests>=2.10.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
 keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0
-kombu>=3.0.25 # BSD
+kombu!=4.0.0,>=3.0.25 # BSD
 netaddr!=0.7.16,>=0.7.13 # BSD
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
 WebOb>=1.6.0 # MIT
@@ -25,7 +25,7 @@ alembic>=0.8.4 # MIT
 six>=1.9.0 # MIT
 stevedore>=1.17.1 # Apache-2.0
 oslo.concurrency>=3.8.0 # Apache-2.0
-oslo.config>=3.14.0 # Apache-2.0
+oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
 oslo.context>=2.9.0 # Apache-2.0
 oslo.db!=4.13.1,!=4.13.2,>=4.10.0 # Apache-2.0
 oslo.log>=3.11.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 434d0a6b3..37a6cc0d4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -22,4 +22,4 @@ testtools>=1.4.0 # MIT
 WebTest>=2.0 # MIT
 
 # releasenotes
-reno>=1.8.0 # Apache2
+reno>=1.8.0 # Apache-2.0