Merge "Remove unreachable code"
Merge "Add support for Neutron https endpoint"
Merge "Fixes for v3 API servers tests"
Merge "Adds NoAuthMiddleware for V3"
Update mailmap

Change-Id: I6b6530841f242829d394998a6dfd85b34e04f232
Merge "Add index to reservations.uuid column"
Fix instance_usage_audit_log v3 follow REST principles

Use query parameter 'before' instead of show.
BTW, add expected_errors decorator.

Partially implements bp v3-api-extension-versioning

DocImpact

Change-Id: If1168c01e6342675370acdf278e1c0317aff93d8
Fix multi availability zone issue part 1

Current aggregate APIs allow user to add multi
AZs to a host, but Openstack support single AZ
of a host. When booting an instance, nova uses
the first AZ assigned to a host,even if user
assigned multi AZs to the host and user chose
the second AZ to boot an instance. So multi AZs
aren't supported by current Openstack design,
we should fix aggregate APIs to align the design
. This patch is for limit user to add multi AZs
using aggregate-add-host API.

The part 2 limits user to add multi AZs using aggregate
update and aggregate metadata update API, here is the
link:
I18ad1ac22c6aee298ccc75c978b85241ae1ac616

Fixes: bug #1196893

Change-Id: I788782a9f21ec2672551f75123753175bb268586
Merge "vendor-data minor format / style cleanups"
Merge "Port ips-extended to API-v3 ips core API Part 1"
Merge "Port ips-extended to API-v3 ips core API Part 2"
Merge "Demote admin-passwd from core of API v3 as extensions os-admin-password"
Merge "Fix extension hosts follow API v3 rules"
Code dedup in class QuotaReserveSqlAlchemyTestCase

Moved common parts to setUp()
   -quotas
   -deltas
   -usages
Move reservations update and usages init to separate functions

bp nova-tests-code-duplication

Change-Id: I03efed0d1f40ba7670c919efed4fdafaf59576f8
Merge "Add identity headers while calling glanceclient"
Merge "Make EvacuateTest DRYer"
Make nbd reservation thread-safe

Avoid the situation where two local threads choose the same nbd number
for injecting files into the instance. If this happened quickly enough
nova was left with one qemu-nbd hanging and blocking the device forever.

Fixes bug 1207422

Change-Id: I18864b19ebd30669534e45ca7a50e12f61207302
xenapi: Rename imageupload image

The imageupload driver concept has helped detangle some of the image managment
code in vm_utils.

It would be nice to extend that benefit to download as well, with an
additional benefit of being able to share more code between the upload and
download paths.

This is the first in a series of patches that aims to to do just that. The
first step is change the name so that it's not just 'imageupload' but
'image'es in general that the driver is managing.

DocImpact

Change-Id: Ia18b82568147a9a40b0da67d74bf20b12d08b9a9
Performs hard reboot if libvirt soft reboot raises libvirtError

Currently the libvirt driver will only attempt a hard reboot if a soft
reboot fails and returns False. If a libvirt exception is raised,
however, the hard reboot is not attempted. This patch wraps the soft
reboot in a try block to continue with the hard reboot attempt if a
libvirtError is raised.

Fixes bug 1202974

Change-Id: Ifaff75b33b5123cdd3293e8f263ccb4f72ae726a
Merge "Refactor compute API's delete to properly do local soft_deletes"