[openstack-glance/el6: 2/2] Merge branch 'master' into el6

[Pádraig Brady]

commit a5b7c4d23b15ce4ac68cb1e45c5f87153b8339fb
Merge: 9884e49 e5a6f83
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Nov 9 01:10:04 2012 +0000

    Merge branch 'master' into el6

 0001-Bump-next-version-to-2012.2.1.patch           |   24 ++++
 ...aultbranch-in-.gitreview-to-stable-folsom.patch |   14 +++
 0003-Pass-empty-args-to-test-config-parser.patch   |   41 +++++++
 0004-pin-sqlalchemy-to-the-0.7.x-series.patch      |   29 +++++
 0005-FakeAuth-not-always-admin.patch               |   42 +++++++
 0006-Delete-from-store-after-registry-delete.patch |  122 ++++++++++++++++++++
 ...-authorization-before-deleting-from-store.patch |   79 +++++++++++++
 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 openstack-glance.spec                              |   23 +++-
 9 files changed, 372 insertions(+), 4 deletions(-)
---
diff --cc openstack-glance.spec
index 96a5b68,817cdd4..75eb88e
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -19,12 -17,15 +19,19 @@@ Source3:          openstack-glance.logr
  #
  # patches_base=2012.2
  #
- Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
+ Patch0001: 0001-Bump-next-version-to-2012.2.1.patch
+ Patch0002: 0002-Set-defaultbranch-in-.gitreview-to-stable-folsom.patch
+ Patch0003: 0003-Pass-empty-args-to-test-config-parser.patch
+ Patch0004: 0004-pin-sqlalchemy-to-the-0.7.x-series.patch
+ Patch0005: 0005-FakeAuth-not-always-admin.patch
+ Patch0006: 0006-Delete-from-store-after-registry-delete.patch
+ Patch0007: 0007-Ensure-authorization-before-deleting-from-store.patch
+ Patch0008: 0008-Don-t-access-the-net-while-building-docs.patch
  
 +# EPEL specific
 +Patch100:         openstack-glance-newdeps.patch
 +Patch101:         crypto.random.patch
 +
  BuildArch:        noarch
  BuildRequires:    python2-devel
  BuildRequires:    python-setuptools
@@@ -107,11 -107,15 +114,18 @@@ This package contains documentation fil
  %prep
  %setup -q -n glance-%{version}
  
- %patch0001 -p1
+ #%patch0001 -p1
+ #%patch0002 -p1
+ #%patch0003 -p1
+ #%patch0004 -p1
+ #%patch0005 -p1
+ %patch0006 -p1
+ %patch0007 -p1
+ %patch0008 -p1
  
 +%patch100 -p1
 +%patch101 -p1
 +
  # Remove bundled egg-info
  rm -rf glance.egg-info
  sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/common/crypt.py glance/db/sqlalchemy/migrate_repo/manage.py