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

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

diff --git a/requirements.txt b/requirements.txt
index a3a59b63c..11b527150 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -35,7 +35,7 @@ PyYAML>=3.10.0 # MIT
 # rabbit driver is the default
 # we set the amqp version to ensure heartbeat works
 amqp<2.0,>=1.4.0 # LGPL
-kombu>=3.0.25 # BSD
+kombu!=4.0.0,>=3.0.25 # BSD
 pika>=0.10.0 # BSD
 pika-pool>=0.1.3 # BSD
 
diff --git a/test-requirements.txt b/test-requirements.txt
index f9e4e4146..b283a255f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -31,7 +31,7 @@ coverage>=4.0 # Apache-2.0
 # this is required for the docs build jobs
 sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
-reno>=1.8.0 # Apache2
+reno>=1.8.0 # Apache-2.0
 
 # AMQP 1.0 support depends on the Qpid Proton AMQP 1.0
 # development libraries.