From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 15 Jul 2016 17:42:54 +0000 (+0000)
Subject: rebase fix-requirements.txt.patch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fanonscm.debian.org%2Fdebian%2Fnewton%2Ffor-xenial;p=openstack-build%2Fheat-build.git

rebase fix-requirements.txt.patch

Rewritten-From: d1721beaaa540480d9ce2a032481b11b38293e8b
---

diff --git a/xenial/debian/patches/fix-requirements.txt.patch b/xenial/debian/patches/fix-requirements.txt.patch
index 6fffdf12..cc6d5588 100644
--- a/xenial/debian/patches/fix-requirements.txt.patch
+++ b/xenial/debian/patches/fix-requirements.txt.patch
@@ -3,10 +3,10 @@ Description: Fix requirements.txt
  stuff.
 Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
-Last-Update: 2016-06-12
+Last-Update: 2016-07-15
 
---- heat-7.0.0~b1.orig/requirements.txt
-+++ heat-7.0.0~b1/requirements.txt
+--- heat-7.0.0~b2.orig/requirements.txt
++++ heat-7.0.0~b2/requirements.txt
 @@ -5,14 +5,14 @@
  pbr>=1.6 # Apache-2.0
  Babel>=2.3.4 # BSD
@@ -17,17 +17,17 @@ Last-Update: 2016-06-12
 -eventlet!=0.18.3,>=0.18.2 # MIT
 +eventlet
  greenlet>=0.3.2 # MIT
- keystoneauth1>=2.1.0 # Apache-2.0
+ keystoneauth1>=2.7.0 # Apache-2.0
 -keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
 +keystonemiddleware
  lxml>=2.3 # BSD
 -netaddr!=0.7.16,>=0.7.12 # BSD
 +netaddr
  oslo.cache>=1.5.0 # Apache-2.0
- oslo.config>=3.9.0 # Apache-2.0
+ oslo.config>=3.12.0 # Apache-2.0
  oslo.concurrency>=3.8.0 # Apache-2.0
-@@ -33,17 +33,17 @@ PasteDeploy>=1.5.0 # MIT
- pycrypto>=2.6 # Public Domain
+@@ -34,17 +34,17 @@ pycrypto>=2.6 # Public Domain
+ aodhclient>=0.5.0 # Apache-2.0
  python-barbicanclient>=4.0.0 # Apache-2.0
  python-ceilometerclient>=2.2.1 # Apache-2.0
 -python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
@@ -39,15 +39,15 @@ Last-Update: 2016-06-12
 +python-keystoneclient
  python-magnumclient>=2.0.0 # Apache-2.0
  python-manilaclient>=1.3.0 # Apache-2.0
- python-mistralclient>=1.0.0 # Apache-2.0
- python-monascaclient>=1.0.30 # Apache-2.0
+ python-mistralclient>=2.0.0 # Apache-2.0
+ python-monascaclient>=1.1.0 # Apache-2.0
  python-neutronclient>=4.2.0 # Apache-2.0
 -python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
 +python-novaclient
  python-openstackclient>=2.1.0 # Apache-2.0
  python-saharaclient>=0.13.0 # Apache-2.0
  python-senlinclient>=0.3.0 # Apache-2.0
-@@ -53,9 +53,8 @@ python-zaqarclient>=1.0.0 # Apache-2.0
+@@ -54,9 +54,8 @@ python-zaqarclient>=1.0.0 # Apache-2.0
  pytz>=2013.6 # MIT
  PyYAML>=3.1.0 # MIT
  requests>=2.10.0 # Apache-2.0