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

[Pádraig Brady]

commit 1e6b2e880bb4bc764356ea24a698981ac231b977
Merge: 46e817b dc6afc0
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sun Apr 8 03:17:08 2012 +0100

    Merge branch 'master' into f17

 .gitignore                                         |    1 +
 ...here-nova-ignores-glance-host-in-imageref.patch |   48 +++++++++++
 ...-libvirt-test-from-deleting-instances-dir.patch |   66 +++++++++++++++
 ...tomic-manipulation-of-libvirt-disk-images.patch |   36 ++++----
 ...d-validation-for-OSAPI-server-name-length.patch |   88 --------------------
 0004-Fixed-bug-962840-added-a-test-case.patch      |   75 +++++++++++++++++
 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...0006-fix-useexisting-deprecation-warnings.patch |    2 +-
 openstack-nova.spec                                |   22 +++--
 sources                                            |    2 +-
 10 files changed, 224 insertions(+), 118 deletions(-)
---