Update specs to v. 2014.1.rc

[openstack-build/neutron-build.git] / rpm / SOURCES / 0002-Remove-dnsmasq-version-warning.patch

diff --git a/rpm/SOURCES/0002-Remove-dnsmasq-version-warning.patch b/rpm/SOURCES/0002-Remove-dnsmasq-version-warning.patch
index 406daca6d6522f100aad9be3f9c7e4a0a6aa0a40..083a84d59a896da35570cc8320f221680a5a269d 100644 (file)
--- a/rpm/SOURCES/0002-Remove-dnsmasq-version-warning.patch
+++ b/rpm/SOURCES/0002-Remove-dnsmasq-version-warning.patch
@@ -1,17 +1,17 @@
-From 85a3b3a1ae3886db3b803db317974e33beaef6a2 Mon Sep 17 00:00:00 2001
+From 268532256d701f2f9d7e10b01a65685e118800dc Mon Sep 17 00:00:00 2001
 From: Terry Wilson <twilson@redhat.com>
 Date: Fri, 13 Dec 2013 09:41:43 -0600
 Subject: [PATCH] Remove dnsmasq version warning
 
 ---
- neutron/agent/linux/dhcp.py |   11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
+ neutron/agent/linux/dhcp.py | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
-index 137f7a9..7406597 100644
+index e650c00..fdac998 100644
 --- a/neutron/agent/linux/dhcp.py
 +++ b/neutron/agent/linux/dhcp.py
-@@ -291,10 +291,13 @@ class Dnsmasq(DhcpLocalProcess):
+@@ -286,10 +286,13 @@ class Dnsmasq(DhcpLocalProcess):
              ver = re.findall("\d+.\d+", out)[0]
              is_valid_version = float(ver) >= cls.MINIMUM_VERSION
              if not is_valid_version: