Merge "Correct returned HTTP status code (Use 403 instead of 413)"
Merge "handle AutoDiskConfigDisabledByImage at API layer"
Merge "Remove metadata/metadetails from instance/server groups"
Merge "Remove duplicate test of passing glance params"
Merge "Deprecate metadata_neutron_* configuration settings"
Merge "docs - Set pbr 'warnerrors' option for doc build"
Merge "Add instance to debug log at compute api"
Merge "Rollback quota in os_tenant_network"
Imported Translations from Transifex

Change-Id: If8ec4cd5d057a56bb9aca62bac112f163b1e665c
Backport some v3 aggregate API unittest to v2 API

This patch add some v3 aggregate API unittest into V2 API to improve
V2 API unittesting.

Change-Id: Id4d533e74b462b55b155b4e4ad7d94e018d35726
Backport some v3 certificate API unittest to v2 API

This patch add some v3 certificate API unittest into V2 API to improve
V2 API unittesting.

Change-Id: Icf58abbf1e83636047c1f98ff80a38077e2d694b
libvirt: fix _disk_resize to make sure converted image will be restored

During the process of resizing disk if an image is in qcow2 with
partition less the process converts the image to raw.
After the extend we should to restore the original format in all cases
not only if 'use_cow_images' is configured to True.

Change-Id: I792e0fb986a6c5cf9ac477cef0949c8a40099faa
Closes-Bug: #1298976
Merge "Boot an instance with multiple vnics on same network"
Merge "libvirt: remove pointless LibvirtBaseVIFDriver class"
Merge "Allow empty volumes to be created"
libvirt: skip disk resize when resize_instance is False

The method finish_migration is called with an extra
parameter 'resize_instance'. It should be used to know
if it is necessary or not to resize the disks and so
call the method 'disk_resize'.

Change-Id: Ia5a9ad7994fa9abab7cf47d36468c46d97065991
Closes-Bug: #1298981
Convert last use of direct database instance fetching from network api

This is the last db.instance_*() call in network/api.py. This patch
converts it to use the Instance object.

Related to blueprint compute-manager-objects-juno

Change-Id: Id7897da6daa3d76a95403466be17f9eaef8b7850
Convert network/api.py uses of vif database functions to objects

This makes network/api.py use the VirtualInterface object instead of direct
database queries. This is the last direct/obvious use of nova.db.* in the
network api.

Related to blueprint compute-manager-objects-juno

Change-Id: Ia3eb1694f3708aeceb4c77876a210a7cb6532be1
Consistently use jsonutils instead of specific implementation

jsonutils have several benefits in comparison to pure json
implementation, like enabling C boosted encoders and decoders for
Python2.6 by using simplejson when available.

Change-Id: I24d0cd442e8d9d89fac50e43fc97f7bb4a293c3d
Closes-Bug: 1329496
Added hacking check for jsonutils

jsonutils provides some additional features in comparison to pure json
or simplejson modules. For example, on Python 2.6, it automatically
switches to simplejson that provides significant performance boost.

So let's enforce usage of the module in replacement to stdlib json.

Change-Id: I86ed6cd3316dd4da5e1b10b36a3ddba3739316d3