[openstack-neutron/el6-icehouse] update to icehouse milestone 1

[Pádraig Brady]

commit 21bff456b88dde4bbe3a43e6e2f46c3e69b0cb12
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Dec 24 12:42:24 2013 +0000

    update to icehouse milestone 1

 .gitignore                                         |    1 +
 ...-use-parallel-installed-versions-in-RHEL6.patch |    2 +-
 0002-Add-fwaas_driver.ini-to-setup.cfg.patch       |    4 ++--
 0003-Remove-dnsmasq-version-warning.patch          |    6 +++---
 openstack-neutron.spec                             |   13 ++++++++-----
 sources                                            |    2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f075a41..3e0ec69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /neutron-2013.2.rc1.tar.gz
 /neutron-2013.2.tar.gz
 /neutron-2013.2.1.tar.gz
+/neutron-2014.1.b1.tar.gz
diff --git a/0001-use-parallel-installed-versions-in-RHEL6.patch b/0001-use-parallel-installed-versions-in-RHEL6.patch
index dedf002..8ef6e92 100644
--- a/0001-use-parallel-installed-versions-in-RHEL6.patch
+++ b/0001-use-parallel-installed-versions-in-RHEL6.patch
@@ -1,4 +1,4 @@
-From 9e612000969a4d41925e554232604f8c44781f99 Mon Sep 17 00:00:00 2001
+From ad196ed84ccf913225ecd8e4f0be505ec377439c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Fri, 13 Apr 2012 17:24:40 +0100
 Subject: [PATCH] use parallel installed versions in RHEL6
diff --git a/0002-Add-fwaas_driver.ini-to-setup.cfg.patch b/0002-Add-fwaas_driver.ini-to-setup.cfg.patch
index db37efd..18a2aa3 100644
--- a/0002-Add-fwaas_driver.ini-to-setup.cfg.patch
+++ b/0002-Add-fwaas_driver.ini-to-setup.cfg.patch
@@ -1,4 +1,4 @@
-From ff890f169ff44e4a9203c0d48ccc1fdd9e2ee711 Mon Sep 17 00:00:00 2001
+From 16881c054ac48f79eb0baf0346d6f6b546eb5abd Mon Sep 17 00:00:00 2001
 From: Terry Wilson <twilson at redhat.com>
 Date: Fri, 6 Dec 2013 11:13:09 -0600
 Subject: [PATCH] Add fwaas_driver.ini to setup.cfg
@@ -11,7 +11,7 @@ Closes-Bug: 1258585
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/setup.cfg b/setup.cfg
-index 1a40944..9fbf8ce 100644
+index fa01e45..0a4edfc 100644
 --- a/setup.cfg
 +++ b/setup.cfg
 @@ -26,6 +26,7 @@ data_files =
diff --git a/0003-Remove-dnsmasq-version-warning.patch b/0003-Remove-dnsmasq-version-warning.patch
index fca484c..464f9d7 100644
--- a/0003-Remove-dnsmasq-version-warning.patch
+++ b/0003-Remove-dnsmasq-version-warning.patch
@@ -1,4 +1,4 @@
-From e026f39d15cc1799762abb9324b82b317b87bd46 Mon Sep 17 00:00:00 2001
+From 2dc0b6562d2060c57c520f73925448f184a1b19d Mon Sep 17 00:00:00 2001
 From: Terry Wilson <twilson at redhat.com>
 Date: Fri, 13 Dec 2013 09:41:43 -0600
 Subject: [PATCH] Remove dnsmasq version warning
@@ -8,10 +8,10 @@ Subject: [PATCH] Remove dnsmasq version warning
  1 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
-index 9e7481d..fbfb852 100644
+index 61fe0bd..7822215 100644
 --- a/neutron/agent/linux/dhcp.py
 +++ b/neutron/agent/linux/dhcp.py
-@@ -277,10 +277,13 @@ class Dnsmasq(DhcpLocalProcess):
+@@ -291,10 +291,13 @@ class Dnsmasq(DhcpLocalProcess):
              ver = re.findall("\d+.\d+", out)[0]
              is_valid_version = float(ver) >= cls.MINIMUM_VERSION
              if not is_valid_version:
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 8ae726e..98b1ef8 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -1,8 +1,8 @@
 %global release_name havana
 
 Name:		openstack-neutron
-Version:	2013.2.1
-Release:	1%{?dist}
+Version:	2014.1
+Release:	0.1.b1%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -12,7 +12,7 @@ Group:		Applications/System
 License:	ASL 2.0
 URL:		http://launchpad.net/neutron/
 
-Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz
+Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.b1.tar.gz
 Source1:	neutron.logrotate
 Source2:	neutron-sudoers
 Source4:	neutron-server-setup
@@ -49,7 +49,7 @@ Source42:	neutron-metering-agent.upstart
 
 Source90:	neutron-dist.conf
 #
-# patches_base=2013.2.1+1
+# patches_base=2014.1.b1+1
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 Patch0002: 0002-Add-fwaas_driver.ini-to-setup.cfg.patch
@@ -417,7 +417,7 @@ IPSec.
 
 
 %prep
-%setup -q -n neutron-%{version}
+%setup -q -n neutron-%{version}.b1
 
 %patch0001 -p1
 %patch0002 -p1
@@ -1004,6 +1004,9 @@ fi
 
 
 %changelog
+* Mon Dec 23 2013 Pádraig Brady <pbrady at redhat.com> - 2014.1.b1-1
+- Update to icehouse milestone 1
+
 * Wed Dec 18 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-1
 - Update to Havana stable release 2013.2.1
 
diff --git a/sources b/sources
index 0b20029..0afe5c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fa84e230aaf372c588b2952772b9acf  neutron-2013.2.1.tar.gz
+fd9f56ff85f22ff2467c880ebf5337b8  neutron-2014.1.b1.tar.gz