Merge "Return client tokens in EC2 DescribeInstances"
Merge "Remove unused import"
Merge "Convert nova.compute.manager's _spawn to objects"
fix log message in APIRouter

In _setup_ext_routes(...) and _setup_extensions(...)[0], there are three
logs telling that I'm setuping extensions routes, and these are done,
those failed. At line3 in [0], every resource woulld be logged before
the line 6-7 skip (conintue in Python). So here should be that I'm
'extending' resource, not 'extended'. Similiar in line 38 and line 43,
these two should be what is done and what is failed.

So this patch fix the first log from 'Extended' to 'Entending', and in
third log, 'extending' to 'extended' instend which makes context log
more reasonable.

[0] http://paste.openstack.org/show/60246/

Change-Id: I2de66f1a8e09945e1915b61771a55af6b630369c
Merge "VMware: clean up unnecessary help message of options"
Hyper-V:Preserve config drive image after the instance is resized

If we configure config_drive_cdrom=True in nova.conf,
the config drive image will be lost after the instance
is resized on hyperV. This is because nova compute will
not copy the disk file if the file's ResourceSubType
is not 'Virtual Hard Disk'.

This commit adds 'Virtual CD/DVD Disk' into disk_resources
to preserve the config drive image after the instance is
resized.

Closes-Bug: #1250324

Change-Id: Ia125a8b132d194ddc2230754fd1b813698b410a8
fix ips to 'ips' in APIRouter

Actually ips in `ips in init_only` would not be valued as True because
ips is a moudle object not a string. Fixing this to string 'ips' could
prevent potential issues and improve readability.

Change-Id: I74564349e1fef00e7430cfb0547b3ad87c8e471c
xenapi: more info when assert_can_migrate fails

VM.assert_can_migrate can fail for many reasons. This makes it hard to
debug, so lets ensure we report the reason we get back from XenServer in
the exception that gets raised and saved into the instance_fault.

Change-Id: I3deb1169d6fe797ca74cd89061bbcf53d416e8d6
Merge "Revert change of default FS from ext3 to etx4"
Merge "Compact pre-Icehouse database migrations <= 180."
Merge "xenapi: more info when assert_can_migrate fails"
Merge "Fix interprocess locks for run_tests.sh"
Merge "VMware: use session.call_method to invoke api's"
xenapi: add support for vcpu_pin_set

This moves vcpu_pin_set config from the libvirt driver into a place that
can be shared between drivers, nova.virt.cpu

At the same time, the utility function that converts the configuration
value into a list of integers has also been moved into nova.virt.cpu

This new code is then used in the XenAPI driver to apply a CPU mask that
implements the currently configured value for vcpu_pin_set

The main use case for this setting is to ensure all guest VMs are not
using the physical CPUs that Dom0 are configured to use.

DocImpact
Completes blueprint xenapi-vcpu-pin-set
Change-Id: I9d53d93db0c5f2a11ad685d3fc335f0cd6b1f79b
Merge "xenapi: add support for vcpu_pin_set"
Merge "Fix inconsistent "image" value on _get_image()"
Merge "Add unit test for ListOfStrings field in object models"
Allow deleting instances while uuid lock is held

Avoid issues where locked up operations on the instance prevent it
from being deleted by the user. Reasons for the lock up are a separate
issue and will be handled elsewhere, but terminating the instance
should not affect any tasks anyway. Any modification should already
gracefully handle the instance going away.

For more discussion about the issue see:
http://lists.openstack.org/pipermail/openstack-dev/2013-October/017454.html

Partial-Bug: #1248563

Change-Id: Ife26ffefccea11d6e9ca5fbd970192b322fc04fd
Merge "libvirt: Set "Disabled Reason" to None when enable nova compute"
Update class/function name for test_extended_availability_zone.py

In test_extended_availability_zone.py, it was using class name and
function name as following:
1) ExtendedServerAttributesTest
2) assertServerAttributes

This is not accurate as this test file is for availability zone,
this patch was change the above two names to:
1) ExtendedAvailabilityZoneTest
2) assertAvailabilityZone

Change-Id: I52d6ebcb1388fc10ac92d66cae166391d46e68c1