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

[Mark McLoughlin]

commit 1ae93b7030152c14bda7e1fdb5b39e7b84d371e2
Merge: bc806b2 2618657
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Wed Oct 26 22:33:31 2011 +0100

    Merge branch 'master' into el6

 ...p-returning-correct-password-on-api-calls.patch |   77 ++++++++++++++++++++
 openstack-nova.spec                                |    7 ++-
 2 files changed, 83 insertions(+), 1 deletions(-)
---
diff --cc openstack-nova.spec
index 30d2038,58c91f2..435ad7e
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:             openstack-nova
  Version:          2011.3
- Release:          5%{?dist}
 -Release:          6%{?dist}
++Release:          7%{?dist}
  Summary:          OpenStack Compute (nova)
  
  Group:            Applications/System
@@@ -358,6 -363,9 +360,9 @@@ f
  %endif
  
  %changelog
 -* 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
  - Fix block migration (#741690)