Merge lp://qastaging/~gandelman-a/ubuntu/precise/nova/UCA_2012.2.1 into lp://qastaging/~ubuntu-cloud-archive/ubuntu/precise/nova/folsom

.pc/applied-patches (+0/-4)
.pc/avoid_setuptools_git_dependency.patch/tools/pip-requires (+2/-2)
.pc/fix-ubuntu-tests.patch/nova/tests/test_api.py (+1/-1)
.pc/path-to-the-xenhost.conf-fixup.patch/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost (+3/-1)
.pc/rbd-security.patch/nova/virt/libvirt/volume.py (+2/-2)
.pc/ubuntu/fix-ec2-volume-id-mappings.patch/nova/db/sqlalchemy/api.py (+0/-5256)
.pc/ubuntu/fix-libvirt-firewall-slowdown.patch/nova/tests/test_libvirt.py (+0/-3919)
.pc/ubuntu/fix-libvirt-firewall-slowdown.patch/nova/virt/firewall.py (+0/-536)
.pc/ubuntu/ubuntu-fix-32-64-bit-iss.patch/nova/tests/test_nfs.py (+0/-629)
.pc/ubuntu/ubuntu-fix-32-64-bit-iss.patch/nova/volume/nfs.py (+0/-293)
.pc/ubuntu/ubuntu-fix-ec2-instance-id-mappings.patch/nova/db/sqlalchemy/api.py (+0/-5253)
AUTHORS (+51/-38)
ChangeLog (+3668/-1329)
PKG-INFO (+1/-1)
bin/nova-dhcpbridge (+1/-1)
bin/nova-manage (+5/-1)
bin/nova-rootwrap (+9/-0)
debian/changelog (+200/-68)
debian/control (+2/-2)
debian/patches/avoid_setuptools_git_dependency.patch (+4/-4)
debian/patches/series (+0/-5)
debian/patches/ubuntu/fix-ec2-volume-id-mappings.patch (+0/-43)
debian/patches/ubuntu/fix-libvirt-firewall-slowdown.patch (+0/-106)
debian/patches/ubuntu/ubuntu-fix-32-64-bit-iss.patch (+0/-75)
debian/patches/ubuntu/ubuntu-fix-ec2-instance-id-mappings.patch (+0/-17)
etc/nova/api-paste.ini (+1/-1)
etc/nova/nova.conf.sample (+1/-1)
etc/nova/rootwrap.d/volume.filters (+1/-0)
nova.egg-info/PKG-INFO (+1/-1)
nova.egg-info/requires.txt (+2/-2)
nova/api/ec2/cloud.py (+14/-2)
nova/api/ec2/ec2utils.py (+3/-1)
nova/api/metadata/base.py (+8/-3)
nova/api/openstack/compute/contrib/admin_actions.py (+11/-5)
nova/api/openstack/compute/contrib/cloudpipe.py (+10/-4)
nova/api/openstack/compute/contrib/floating_ips.py (+20/-12)
nova/api/openstack/compute/contrib/networks.py (+2/-2)
nova/api/openstack/compute/server_metadata.py (+3/-0)
nova/api/openstack/compute/servers.py (+36/-11)
nova/api/openstack/wsgi.py (+14/-4)
nova/block_device.py (+8/-1)
nova/cloudpipe/pipelib.py (+1/-0)
nova/compute/api.py (+180/-118)
nova/compute/instance_types.py (+4/-1)
nova/compute/manager.py (+109/-30)
nova/compute/resource_tracker.py (+25/-2)
nova/consoleauth/manager.py (+2/-2)
nova/db/sqlalchemy/api.py (+9/-2)
nova/exception.py (+18/-4)
nova/flags.py (+9/-0)
nova/image/glance.py (+2/-2)
nova/network/__init__.py (+6/-4)
nova/network/api.py (+1/-1)
nova/network/linux_net.py (+1/-0)
nova/network/manager.py (+68/-45)
nova/network/quantumv2/api.py (+218/-11)
nova/openstack/common/cfg.py (+1/-1)
nova/openstack/common/log.py (+4/-5)
nova/openstack/common/notifier/api.py (+3/-3)
nova/openstack/common/policy.py (+3/-2)
nova/openstack/common/rpc/__init__.py (+9/-3)
nova/openstack/common/rpc/amqp.py (+8/-0)
nova/openstack/common/rpc/impl_kombu.py (+18/-12)
nova/openstack/common/rpc/impl_qpid.py (+35/-53)
nova/openstack/common/setup.py (+11/-5)
nova/openstack/common/timeutils.py (+7/-3)
nova/scheduler/chance.py (+1/-1)
nova/scheduler/driver.py (+4/-4)
nova/scheduler/filter_scheduler.py (+1/-2)
nova/scheduler/host_manager.py (+29/-16)
nova/tests/api/ec2/test_cloud.py (+56/-4)
nova/tests/api/ec2/test_middleware.py (+9/-0)
nova/tests/api/openstack/compute/contrib/test_admin_actions.py (+35/-2)
nova/tests/api/openstack/compute/contrib/test_cloudpipe.py (+5/-6)
nova/tests/api/openstack/compute/contrib/test_floating_ips.py (+25/-0)
nova/tests/api/openstack/compute/test_server_actions.py (+69/-0)
nova/tests/api/openstack/compute/test_server_metadata.py (+6/-6)
nova/tests/api/openstack/compute/test_servers.py (+131/-4)
nova/tests/api/openstack/fakes.py (+3/-2)
nova/tests/compute/test_compute.py (+158/-43)
nova/tests/compute/test_compute_utils.py (+30/-13)
nova/tests/compute/test_resource_tracker.py (+22/-18)
nova/tests/fake_libvirt_utils.py (+4/-1)
nova/tests/fake_network.py (+2/-2)
nova/tests/fakelibvirt.py (+14/-0)
nova/tests/network/test_linux_net.py (+1/-1)
nova/tests/network/test_manager.py (+48/-0)
nova/tests/network/test_quantumv2.py (+325/-9)
nova/tests/scheduler/fakes.py (+4/-4)
nova/tests/scheduler/test_chance_scheduler.py (+4/-4)
nova/tests/scheduler/test_filter_scheduler.py (+1/-1)
nova/tests/scheduler/test_scheduler.py (+1/-1)
nova/tests/test_api.py (+1/-1)
nova/tests/test_exception.py (+0/-1)
nova/tests/test_imagecache.py (+24/-0)
nova/tests/test_libvirt.py (+222/-14)
nova/tests/test_metadata.py (+2/-2)
nova/tests/test_notifications.py (+2/-2)
nova/tests/test_nova_manage.py (+5/-0)
nova/tests/test_utils.py (+54/-6)
nova/tests/test_virt_drivers.py (+17/-0)
nova/tests/test_volume.py (+2/-0)
nova/tests/test_xenapi.py (+59/-6)
nova/tests/xenapi/stubs.py (+13/-22)
nova/utils.py (+29/-0)
nova/version.py (+2/-2)
nova/virt/firewall.py (+3/-3)
nova/virt/hyperv/driver.py (+2/-2)
nova/virt/hyperv/livemigrationops.py (+1/-1)
nova/virt/libvirt/driver.py (+86/-43)
nova/virt/libvirt/imagecache.py (+4/-1)
nova/virt/libvirt/utils.py (+45/-1)
nova/virt/libvirt/volume.py (+2/-2)
nova/virt/xenapi/driver.py (+25/-2)
nova/virt/xenapi/fake.py (+8/-2)
nova/virt/xenapi/host.py (+19/-0)
nova/virt/xenapi/vm_utils.py (+26/-37)
nova/virt/xenapi/vmops.py (+18/-2)
nova/virt/xenapi/volumeops.py (+3/-1)
nova/volume/driver.py (+63/-5)
nova/volume/iscsi.py (+9/-1)
nova/volume/manager.py (+7/-1)
plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost (+3/-1)
tools/pip-requires (+2/-2)