Merge "Extend LibvirtConfigGuest to parse guest cpu element info"
Merge "Make baremetal_deploy_helper understand ephemeral disks"
Merge "Enable non-ascii characters in flavor names"
Merge "Ensure deleted instances' status is always DELETED"
Fix a lazy-load exception in security_group_update()

When security_group_api is nova, the update_security_group api raises http
500 error: group rules fails with lazy load exception. Because the rule
infos of the security group will be return in response body, but the rule
attribute hasn't been preloaded.

Closes-Bug: #1244018
Change-Id: Ie07879ac22e4add90f75968778bf334915e8349c
Merge "Rename _get_vm_state to _get_vm_status"
Merge "Remove unused local variables in test case"
Merge "Periodic task _poll_unconfirmed_resizes can now use slave db"
Corrected typo in host_manager

Change-Id: I6173e00000c7245bf190165182e2242a540aff0d
Merge "xenapi: move session into new client module"
Merge "Sync Log Levels from OSLO"
Merge "handle empty network info in instance cache"
Merge "Extend the scheduler HostState for metrics from compute_node"
Merge "Fix power manager hangs while executing ipmitool"
Merge "Address infinite loop in nova compute when getting network info"
Supplement 'os-migrateLive' in actions list

The test for actions with non existed instance missing the action
'os-migrateLive'.

Change-Id: Ia36c369d60bea9500cc5a64be7971e60cbe79377
Closes-Bug: #1255023
Merge "Make baremetal support metadata for ephemeral block-device-mapping"
Merge "Remove nullable=True in models.py which is set by default"
Merge "Added monitor (e.g. CPU) to monitor and collect data"
Merge "Add v3 api samples for shelve"