[openstack-nova/el6: 5/5] Merge branch 'el6-folsom' into el6

[Pádraig Brady]

commit 6025ee7fe964da5593258508df70194eb73ad841
Merge: dd08c00 86b60a7
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Nov 2 12:10:54 2012 +0000

    Merge branch 'el6-folsom' into el6
    
    Conflicts:
    	0001-ensure-atomic-manipulation-of-libvirt-disk-images.patch
    	0002-Ensure-we-don-t-access-the-net-when-building-docs.patch
    	0003-fix-useexisting-deprecation-warnings.patch
    	0004-support-a-configurable-libvirt-injection-partition.patch
    	0005-only-mount-guest-image-once-when-injecting-files.patch
    	0006-set-correct-SELinux-context-for-injected-ssh-keys.patch
    	0007-Tolerance-when-parsing-null-connection-info-in-BDM.patch
    	0008-Support-EC2-CreateImage-API-for-boot-from-volume.patch
    	0009-EC2-DescribeImages-reports-correct-rootDeviceType.patch
    	0010-Reject-EC2-CreateImage-for-instance-store.patch
    	0011-Fix-EC2-CreateImage-no_reboot-logic.patch

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |   24 +++
 ...tomic-manipulation-of-libvirt-disk-images.patch |  188 --------------------
 ...e-don-t-access-the-net-when-building-docs.patch |   25 ---
 0003-fix-useexisting-deprecation-warnings.patch    |   49 -----
 ...-configurable-libvirt-injection-partition.patch |   80 ---------
 ...unt-guest-image-once-when-injecting-files.patch |  174 ------------------
 ...ect-SELinux-context-for-injected-ssh-keys.patch |   68 -------
 ...-when-parsing-null-connection-info-in-BDM.patch |   41 -----
 ...-EC2-CreateImage-API-for-boot-from-volume.patch |  185 -------------------
 ...ribeImages-reports-correct-rootDeviceType.patch |   66 -------
 ...Reject-EC2-CreateImage-for-instance-store.patch |  158 ----------------
 0011-Fix-EC2-CreateImage-no_reboot-logic.patch     |   94 ----------
 ...oid-RPC-calls-while-holding-iptables-lock.patch |  103 -----------
 nova-sudoers                                       |    2 +-
 nova.conf                                          |   21 ++-
 openstack-nova-newdeps.patch                       |   25 +++-
 openstack-nova.spec                                |  112 +++++-------
 sources                                            |    2 +-
 19 files changed, 111 insertions(+), 1307 deletions(-)
---
diff --cc .gitignore
index a4c6b8f,56a8f9c..12c3c9b
--- a/.gitignore
+++ b/.gitignore
@@@ -3,4 -3,4 +3,5 @@@
  /nova-2012.1~rc1.tar.gz
  /nova-2012.1.tar.gz
  /nova-2012.1.1.tar.gz
 +/nova-2012.1.3.tar.gz
+ /nova-2012.2.tar.gz
diff --cc openstack-nova.spec
index 25d3ada,82ff9dd..6af1766
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -769,19 -749,12 +749,25 @@@ f
  %endif
  
  %changelog
+ * Tue Oct 30 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-2
+ - Add support for python-migrate-0.6
+ 
+ * Thu Oct 11 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-1
+ - Update to folsom final
+ 
 +* Fri Oct 12 2012 Nikola Dipanov <ndipanov at redhat.com> - 2012.1.3-1
 +- Restore libvirt block storage connections on reboot
 +- Fix libvirt volume attachment error logging
 +- Ensure instances with deleted floating IPs can be deleted
 +- Ensure can contact floating IP after instance snapshot
 +- Fix tenant usage time accounting
 +- Ensure correct disk definitions are used on volume attach/detach
 +- Improve concurrency of long running tasks
 +- Fix unmounting of LXC containers in the presence of symlinks
 +- Fix external lock corruption in the presence of SELinux
 +- Allow snapshotting images that are deleted in glance
 +- Ensure the correct fixed IP is deallocated when deleting VMs
 +
  * Fri Aug 10 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-15
  - Fix package versions to ensure update dependencies are correct
  - Fix CA cert permissions issue introduced in 2012.1.1-10