Merge "VMware: Create fake VM with given datastore"
Merge "VMware: Fix type of VM's config.hardware.device in fake"
Merge "VMware: refactor spawn() code to build a new VM"
Merge "VMware: spawn refactor _configure_config_drive"
Merge "Fix V2 unit tests to test hypervisor API as admin"
Merge "filter: add per-aggregate filter to configure max_io_ops_per_host"
Merge "Share common test settings in test_flavor_manage"
Merge "add log exception hints in some modules"
Deprecate cinder_* configuration settings

Create a new section in the configuration file called 'cinder'.
Move all of the cinder_* configuration settings to this section.

DocImpact

The table below has the changes:

+---------------------------------+----------------------------+
| 'DEFAULT' Section               | 'cinder' Section           |
|---------------------------------|----------------------------|
| cinder_catalog_info             | catalog_info               |
| cinder_endpoint_template        | endpoint_template          |
| os_region_name                  | os_region_name             |
| cinder_ca_certificates_file     | ca_certificates_file       |
| cinder_http_retries             | http_retries               |
| cinder_http_timeout             | http_timeout               |
| cinder_api_insecure             | api_insecure               |
| cinder_cross_az_attach          | cross_az_attach            |
+---------------------------------+----------------------------+

UpgradeImpact
The changes are backward compatible.

Change-Id: Ie6b3f9d60b5e149375ff3039be444538f5f50756
Merge "Raise HTTPNotFound error from V2 cert show API"
Merge "VMware: handle case when VM snapshot delete fails"
filter: add per-aggregate filter to configure disk_allocation_ratio

Adds a filter AggregateDiskFilter which provides the ability to
read from aggregates metadata the "disk_allocation_ratio".

DocImpact
Implements: blueprint per-aggregate-disk-allocation-ratio
Change-Id: I79d59fcdfb09e67ed6f12113615c673624b24a19
Merge "Add numa_topology column to the compute_node table"
Check vlan parameter is valid

Now, we can create network with invalid vlan with nova-network.
Check if vlan parameter is greater than 4094 or less than 1.

Change-Id: I27a74fb76ba575f43fee669c0c495e0ef96d4b18
Closes-Bug: #1334563
Merge "Change v3 admin-password to v2.1"
A minor change to a comments

The service list version information does not match, fix it.

Change-Id: Ibc88aedcf63bbcc5a36fd3a3bd92d0a0f0424fb2
Merge "Add a Set and SetOfIntegers object fields"
Merge "Share unittest between v2 and v2.1 for hide_server_addresses extension"
Merge "Avoid refreshing PCI devices on instance.save()"
Merge "Allow attaching external networks based on configurable policy"