From: Rodion Tikunov <rtikunov@mirantis.com>
Date: Thu, 21 Apr 2016 14:14:42 +0000 (+0300)
Subject: Deleting 0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8986d11e23086e6ccc18120286b14e9aa25fb06d;p=openstack-build%2Fneutron-build.git

Deleting 0001-requirements.txt-adjust-for-Ubuntu-14.04.patch

We do not need patch 0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
anymore because we make changes in 7.0 requirements.txt directly

Closes-Bug: #1573044
Change-Id: Ie939d22c4153a2078f473381014b81f5f9f4e095
---

diff --git a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
deleted file mode 100644
index f4a2393c6..000000000
--- a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5bd791562e9b125b756742c8d469b73321d66331 Mon Sep 17 00:00:00 2001
-From: Sergey Kolekonov <skolekonov@mirantis.com>
-Date: Wed, 12 Aug 2015 11:25:32 +0300
-Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04
-
-* Routes!=2.0 restriction is necessary only for running tests with python 3.x,
-  routes 2.0 works just fine with python 2.7
----
- requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index a1956c0..4e4395e 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -5,7 +5,7 @@ pbr!=0.7,<1.0,>=0.6
- 
- Paste
- PasteDeploy>=1.5.0
--Routes!=2.0,>=1.12.3
-+Routes>=1.12.3
- eventlet!=0.17.0,>=0.16.1
- greenlet>=0.3.2
- httplib2>=0.7.5
--- 
-1.9.1
-
diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index f3134ef90..5d693f0fe 100644
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,3 +1,2 @@
-0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
 fix-neutron-configuration.patch
 skip-iptest.patch