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

[Pádraig Brady]

commit 7d00b240bb504284fbc00effebae232e4c7ed50e
Merge: 41d2089 029ffcd
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Nov 24 10:42:57 2011 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	openstack-glance.spec

 openstack-glance-docmod.patch |   22 ++++++++++++++++++++++
 openstack-glance-nonet.patch  |   13 +++++++++++++
 openstack-glance.spec         |   10 +++++++++-
 3 files changed, 44 insertions(+), 1 deletions(-)
---
diff --cc openstack-glance.spec
index 6cf07de,335e081..2a76875
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -8,9 -8,11 +8,11 @@@ Group:            Applications/Syste
  License:          ASL 2.0
  URL:              http://glance.openstack.org
  Source0:          http://launchpad.net/glance/diablo/%{version}/+download/glance-%{version}.tar.gz
 -Source1:          openstack-glance-api.service
 -Source2:          openstack-glance-registry.service
 +Source1:          openstack-glance-api.init
 +Source2:          openstack-glance-registry.init
  Source3:          openstack-glance.logrotate
+ Patch0:           openstack-glance-docmod.patch
+ Patch1:           openstack-glance-nonet.patch
  
  BuildArch:        noarch
  BuildRequires:    python2-devel
@@@ -186,9 -203,10 +190,13 @@@ f
  %doc doc/build/html
  
  %changelog
+ * Tue Nov 22 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-2
+ - Ensure the docs aren't built with the system glance module
+ - Ensure we don't access the net when building docs
+ 
 +* Fri Oct 21 2011 David Busby <oneiroi at fedoraproject.org> - 2011.3-1
 +- Update to Diablo Final
 +
  * Tue Sep 27 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-1
  - Update to Diablo final