Merge "Use v1 as default for cinder_catalog_info"
Add new db api get functions for ec2_snapshot

This patch adds two new getters for EC2 snapshot mappings to the db
API.  The existing getters don't return the full db model.  Instead,
they only return an ID or UUID.  The full db model is needed when this
gets converted over to a nova object.

Related to blueprint convert-ec2-api-to-use-nova-objects

Change-Id: I8e2ed5086a7768f373d35c2f34386f2d30d11e07
Use flavor in confirm-resize to drop claim

Current the confirm_resize() clean the stashed instance_type information
before invoking the drop_resize_claim, and the drop_resize_claim() try to
fetch the old instance_type in system metadata, which will be wrong.

We change the _cleanup_stored_instance_types() to pass back the
to_be_dropped instance_type, and use that information for drop_resize_claim.

Change-Id: Iba36acc75d3840104746596977b33bcd4e010f2e
Merge "Drop instance_group_metadata from the database"
VMware: revert deletion of cleanup_host

Commit 1deb31f85a8f5d1e261b2cf1eddc537a5da7f60b removes cleanup_host
by mistake. This adds the missing method back.

Related-Bug: #1355875

Change-Id: If695bf00613fe389af91f453dbc8191698d95a94
Merge "Merge BadRequest tests of "get console output" API"
Merge "Revert "libvirt: add version cap tied to gate CI testing""
Fix hacking check for jsonutils

Hacking checks with logical_lines should use yield not return.

The jsonutils rule was added in:
I86ed6cd3316dd4da5e1b10b36a3ddba3739316d3

Now that the function uses yield, it can trigger twice in dumps (dump
and dump), so look for a '(' at the afterwards. Don't display the '(' at
the end of the error message since its confusing to read.

Change-Id: I277dba08fdd30734409eee36008cebda35886968
Closes-Bug: #1356687
Merge "VMware: revert deletion of cleanup_host"
Merge "Fix live-migration failure in FC multipath case"
Merge "Add new db api get functions for ec2_snapshot"
Merge "Merge unit tests of "create a flavor" API"
Merge "Log cleanups for nova.network.neutron.api"
Hacking: a new hacking check was added that used an existing number

Commit 243879f5c51fc45f03491bcb78765945ddf76be8 added in a new hacking
check that used an existing number.

The new number is 324 (and not 323)

Change-Id: I7e604a408387438105c435ad16a1fa3d6491b642
Closes-bug: #1356815
filter: add per-aggregate filter to configure max_io_ops_per_host

Adds a filter AggregateIoOpsFilter whichprovides the ability
to read from aggregates metadata "max_io_ops_per_host".

DocImpact
Implements: blueprint per-aggregate-max-io-ops-per-host
Change-Id: I086033e7904c16995298bee7196ad3e7b5dc7aaf
Merge "Add debug log for availability zone filter"
Merge "Backport v3 api unittest into v2 api for attach_interface extension"
Merge "Use common get_instance function in v2 attach_interface"
Merge "Return 404 instead of 501 for unsupported actions"
Merge "Resize block device after swap to larger volume"