From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 10 Dec 2015 08:05:16 +0000 (+0000)
Subject: Merge "Updated from global requirements"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c029fcba7e058c7d58cb071bb0ee0356b292d83b;p=openstack-build%2Fneutron-build.git

Merge "Updated from global requirements"
---

c029fcba7e058c7d58cb071bb0ee0356b292d83b
diff --cc requirements.txt
index 372ba5298,772055ad2..450df3ad0
--- a/requirements.txt
+++ b/requirements.txt
@@@ -31,13 -31,12 +31,13 @@@ oslo.context>=0.2.0 # Apache-2.
  oslo.db>=3.2.0 # Apache-2.0
  oslo.i18n>=1.5.0 # Apache-2.0
  oslo.log>=1.12.0 # Apache-2.0
- oslo.messaging!=2.8.0,>2.6.1 # Apache-2.0
+ oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0
  oslo.middleware>=3.0.0 # Apache-2.0
  oslo.policy>=0.5.0 # Apache-2.0
 +oslo.reports>=0.6.0  # Apache-2.0
  oslo.rootwrap>=2.0.0 # Apache-2.0
  oslo.serialization>=1.10.0 # Apache-2.0
- oslo.service>=0.12.0 # Apache-2.0
+ oslo.service>=1.0.0 # Apache-2.0
  oslo.utils>=2.8.0 # Apache-2.0
  oslo.versionedobjects>=0.13.0