[openstack-quantum/f19: 4/6] Update to grizzly release

[Gary Kotton]

commit c314d845c13c9c760059cff2bd049eb2d0d81c3f
Author: Gary Kotton <gkotton at redhat.com>
Date:   Mon Apr 8 04:03:19 2013 -0400

    Update to grizzly release

 .gitignore             |    5 ++++-
 openstack-quantum.spec |    9 +--------
 sources                |    2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a10c8e..6556634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/quantum-2013.1.1.tar.gz
+/quantum-2013.1.g3.tar.gz
+/quantum-2013.1.rc2.tar.gz
+/quantum-2013.1.rc3.tar.gz
+/quantum-2013.1.tar.gz
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 22513ca..903afe5 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -5,7 +5,7 @@
 
 Name:		openstack-quantum
 Version:	2013.1
-Release:	0.7.%{milestone}%{?dist}
+Release:	1%{?dist}
 Summary:	OpenStack Networking Service
 
 Group:		Applications/System
@@ -280,11 +280,7 @@ networks using multiple other quantum plugins.
 %prep
 %setup -q -n quantum-%{version}
 
-<<<<<<< HEAD
-sed -i 's/%{version}/%{version}/' PKG-INFO
-=======
 sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
->>>>>>> Update to grizzly rc3
 
 find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
 
@@ -682,7 +678,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
 * Mon May 13 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-2
 - Update to grizzly release
 - Update install scripts to configure security groups
@@ -691,8 +686,6 @@ fi
 * Wed Apr  4 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-1
 - Update to grizzly release
 
-=======
->>>>>>> Update to grizzly rc3
 * Wed Apr  4 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-0.7.rc3
 - Update to grizzly rc3
 - Update rootwrap (bug 947793)
diff --git a/sources b/sources
index 1a4d0d5..93b2eb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69108a32c26381246865fa6b34fcb14f  quantum-2013.1.rc3.tar.gz
+1ad2338b25cfde582de479678533113e  quantum-2013.1.tar.gz