[openstack-neutron/el6-icehouse] Update to upstream 2014.1

[Ihar Hrachyshka]

commit 7bece406590c6f74db1d9da3314cebb2975be8b7
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Fri Apr 18 14:55:05 2014 +0200

    Update to upstream 2014.1
    
    Conflicts:
    	.gitignore
    	openstack-neutron.spec

 .gitignore             |    1 +
 openstack-neutron.spec |   12 +++++++-----
 sources                |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 804c0ae..4fa728f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /neutron-2014.1.b3.tar.gz
 /neutron-2014.1.rc1.tar.gz
 /neutron-2014.1.rc2.tar.gz
+/neutron-2014.1.tar.gz
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index a3ab931..e3b68db 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	0.19.1.rc2%{?dist}
+Release:	1%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -12,8 +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}.rc1.tar.gz
-Source0:	http://launchpad.net/neutron/%{release_name}/%{release_name}-rc2/+download/neutron-%{version}.rc2.tar.gz
+Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz
 Source1:	neutron.logrotate
 Source2:	neutron-sudoers
 Source4:	neutron-server-setup
@@ -50,7 +49,7 @@ Source42:	neutron-metering-agent.upstart
 
 Source90:	neutron-dist.conf
 #
-# patches_base=2014.1.rc2+1
+# patches_base=2014.1+1
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 Patch0002: 0002-Remove-dnsmasq-version-warning.patch
@@ -476,7 +475,7 @@ IPSec.
 
 
 %prep
-%setup -q -n neutron-%{version}.rc2
+%setup -q -n neutron-%{version}
 
 %patch0001 -p1
 %patch0002 -p1
@@ -1107,6 +1106,9 @@ fi
 
 
 %changelog
+* Fri Apr 18 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-1
+- Update to upstream 2014.1
+
 * Tue Apr 15 2014 Miguel Ángel Ajo <majopela at redhat.com> -2014.1-0.19.rc2
 - Include the systemd readiness notification patch
 
diff --git a/sources b/sources
index dd31ffd..7e82846 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86a32596ed2cd141e8cbab3f7c710dec  neutron-2014.1.rc2.tar.gz
+7e44f77c8d4704534724b34770e3224f  neutron-2014.1.tar.gz