From a5baf65a27be127bef6e7b29e05b787d0fab2e44 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 19 Mar 2015 00:55:43 +0100 Subject: [PATCH] Rebased debian/patches/allow-route-2.0.patch Rewritten-From: 99523f7bac96f6c768a0cbf7b50b8299a04b397e --- trusty/debian/patches/allow-route-2.0.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/trusty/debian/patches/allow-route-2.0.patch b/trusty/debian/patches/allow-route-2.0.patch index a0e67156..558ae344 100644 --- a/trusty/debian/patches/allow-route-2.0.patch +++ b/trusty/debian/patches/allow-route-2.0.patch @@ -4,16 +4,16 @@ Description: Allow routes 2.0 the restriction. Author: Thomas Goirand Forwarded: not-needed -Last-Update: 2014-12-26 +Last-Update: 2015-03-19 ---- heat-2015.1~b1.orig/requirements.txt -+++ heat-2015.1~b1/requirements.txt -@@ -37,7 +37,7 @@ python-troveclient>=1.0.7 +--- heat-2015.1~b2+git20150318+2956841a2e.orig/requirements.txt ++++ heat-2015.1~b2+git20150318+2956841a2e/requirements.txt +@@ -39,7 +39,7 @@ python-troveclient>=1.0.7 PyYAML>=3.1.0 qpid-python requests>=2.2.0,!=2.4.0 -Routes>=1.12.3,!=2.0 +Routes>=1.12.3 - six>=1.7.0 + six>=1.9.0 SQLAlchemy>=0.9.7,<=0.9.99 - sqlalchemy-migrate>=0.9.1,!=0.9.2 + sqlalchemy-migrate>=0.9.5 -- 2.45.2