Merge "Make xenapi agent code use Instance object for updates"
Merge "Convert xenapi/vmops uses of instance_update to objects"
Merge "Make vmwareapi/vmops use Instance object for updates"
Merge "Make libvirt driver use instance object for updates"
Merge "Remove conductor usage from compute.utils.EventReporter"
Imported Translations from Transifex

Change-Id: I7fe269b7c1aac270e2b96becf786cd25e88614eb
Merge "Fix v3 API extension names for camelcase"
Rename quota_injected_file_path_bytes

Rename quota_injected_file_path_bytes to
quota_injected_file_path_length, and change help message to
'Length of injected file path'.

DocImpact

Change-Id: Id6b9c03b37664601937e4bc9d4a8d8026c4d3b63
Closes-bug: 1258175
Make baremetal driver use Instance object for updates

This makes the baremetal driver use the Instance object it is passed
to do its update instead of using the old conductor raw method.

Related to blueprint virt-objects-juno

Change-Id: I4116f1645562353134534dc6b883e8052c1aa706
Remove unused instance_update() method from virtapi

This removes the now-unused instance_update() method from the VirtAPI.

Related to blueprint virt-objects-juno

Change-Id: Iaa55e7156244c9cdf7558e23ecab49db162daa37
Merge "Fix wrong used ProcessExecutionError exception"
Merge "Make baremetal driver use Instance object for updates"
VMware: Add check for datacenter with no datastore

When there is a datacenter with no datastore in it,
nova boot fails.

This patch addresses the issue by adding a check
and ignoring the empty datacenter.

Change-Id: I3c8242767f5991d4aeffab09c763a21493fc363e
closes-bug: #1302482
Merge "Remove unused instance_update() method from virtapi"
Merge "Remove unused nova.crypto.compute_md5()"
Merge "Add Nova API Sample file & test for get keypair"
Merge "Remove logging in libvirt _connect_auth_cb to avoid eventlet locking"
VMware: Fix usage of an alternate ESX/vCenter port

IPv6 addresses use square brackets to delimit address vs. port.
A comment in vim.py file incorrectly states the host and port can be
specified as host:port.  According to nova.conf, port isn't
even part of the host option.

This patch will create a separate port option to nova.conf instead
of allowing the port to be part of the host_ip option.

DocImpact: new host_port option added to nova.conf
Change-Id: Iebd415b5b3a9d2be42861220366135d2cb57b14d
Closes-bug: #1287292
Merge "Unit test case for more than 1 ephemeral disks in BDM"
Merge "Deprecate action_event_*() from conductor"