[openstack-nova/el6: 7/8] Merge branch 'master' into el6

[Pádraig Brady]

commit 07731dced5d00429de8038469cb633f1fde09315
Merge: b3e3b9d 66f8f58
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Dec 1 18:20:01 2011 +0000

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

 ...57-abstract-out-disk-image-access-methods.patch |  535 ++++++++++++++++++++
 ...7-support-handling-images-with-libguestfs.patch |   90 ++++
 openstack-nova-nonet.patch                         |   11 +
 openstack-nova.spec                                |   36 ++-
 4 files changed, 666 insertions(+), 6 deletions(-)
---
diff --cc openstack-nova.spec
index afd4637,cb19199..81c539d
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -423,13 -444,20 +440,20 @@@ f
  %endif
  
  %changelog
- * Tue Nov 29 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-9
+ * Wed Nov 30 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-10
+ - Add libguestfs support
+ 
+ * Tue Nov 29 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-9
+ - Update the libvirt dependency from 0.8.2 to 0.8.7
+ - Ensure we don't access the net when building docs
+ 
+ * Tue Nov 29 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-8
  - Change default database to mysql. (#735012)
  
 -* Mon Nov 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-7
 +* Mon Nov 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-8
  - Add ~20 significant fixes from upstream stable branch
  
 -* Wed Oct 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-6
 +* Wed Oct 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-7
  - Fix password leak in EC2 API (#749385, CVE 2011-4076)
  
  * Mon Oct 24 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-5