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

[Pádraig Brady]

commit 6392fb99c20cc83ada3cb515f7b9cde9e603addb
Merge: 0a54ca3 2681d00
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Jan 11 17:36:00 2012 +0000

    Merge branch 'master' into el6

 ...estfs-operation-with-specified-partitions.patch |   43 +
 ...-overwrite-project_id-from-request-params.patch | 1505 ++++++++++++++++++++
 openstack-nova.spec                                |   10 +-
 3 files changed, 1557 insertions(+), 1 deletions(-)
---
diff --cc openstack-nova.spec
index 9e5f286,03b396d..ce2dd2f
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -367,10 -367,9 +369,12 @@@ This package contains documentation fil
  %patch93 -p1
  %patch94 -p1
  %patch95 -p1
+ %patch96 -p1
+ %patch97 -p1
  
 +# Apply EPEL patch
 +%patch100 -p1
 +
  find . \( -name .gitignore -o -name .placeholder \) -delete
  
  find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;