[openstack-neutron] update to icehouse milestone 1

[Pádraig Brady]

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

    update to icehouse milestone 1

 .gitignore                                   |    1 +
 0001-Add-fwaas_driver.ini-to-setup.cfg.patch |    4 ++--
 openstack-neutron.spec                       |   13 ++++++++-----
 sources                                      |    2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db03ccb..83a4c41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,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-Add-fwaas_driver.ini-to-setup.cfg.patch b/0001-Add-fwaas_driver.ini-to-setup.cfg.patch
index fd22ffc..001ff14 100644
--- a/0001-Add-fwaas_driver.ini-to-setup.cfg.patch
+++ b/0001-Add-fwaas_driver.ini-to-setup.cfg.patch
@@ -1,4 +1,4 @@
-From 6b889cf184944cfae6dca4917356755243961f53 Mon Sep 17 00:00:00 2001
+From 571697f27bfcb2218efd5e7f4f1da3adec9dfea8 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/openstack-neutron.spec b/openstack-neutron.spec
index ee92d97..541bc2c 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.4.b3
 Summary:	OpenStack Networking Service
@@ -11,7 +11,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
@@ -34,7 +34,7 @@ Source22:	neutron-metering-agent.service
 
 Source30:	neutron-dist.conf
 #
-# patches_base=2013.2.1+1
+# patches_base=2014.1.b1+1
 #
 Patch0001: 0001-Add-fwaas_driver.ini-to-setup.cfg.patch
 
@@ -390,7 +390,7 @@ IPSec.
 
 
 %prep
-%setup -q -n neutron-%{version}
+%setup -q -n neutron-%{version}.b1
 
 %patch0001 -p1
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
@@ -912,6 +912,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