Merge "List migrations through Admin API"
Change db.api.instance_type_ to db.api.flavor_

Rename nova.db.api and nova.db.sqlalchemy.api functions from
instance_type_ to flavor_.  Since this is a fairly large change, leave
backwards compatibility in until all dependant changes (moving code from
db.instance_type_*).

Partially implements bp flavor-instance-type-dedup

Change-Id: Ie81c66e13056537ca26ff04defdb6eb86d5c462a
Merge "Update openstack.common.config"
Merge "Make sure periodic cleanup of instances continues on error"
xenapi: glance plugin should close connections

Current the xenapi glance plugin does not close
httplib connections when exceptions are raised.

Note this code is run under python 2.4 so with
is not available.

Fixes bug 1197846

Change-Id: I5cfb067320e7506109c301532a95fe83aa4fd0f9
Fix info_cache and bw_usage update race

A race existed where it was possible two greenthreads to attempt to create a
new info_cache or bw_usage record for a given instance. This would result in a
DBDuplicateEntry exception.

In both of these cases, first-one-wins is an acceptable solution, so we can
swallow the exception safely.

Fixes bug 1199468

Change-Id: Icc81bb013fa9dc142f88adbe4d11cdbd350230cc
Merge "Sync models.Console* with migrations."
Merge "Export just the volume metadata for the database to be populated"
Imported Translations from Transifex

Change-Id: I1f3e14c32ee9bd0791406552394d7730988ff3da
Validate volume_size in block_device_mapping

Reject invalid values for volume_size upfront.
For compatibility with old python-novaclient, an
empty volume_size is ignored.

Create a common _validate_int_value() function for
validating that a parameter is an integer in a given
range. Use it also for min_count/max_count to share code.

Fixes LP Bug#1199539

Change-Id: I18ac285d5b3c8200d7706c7d577809b15d6ab9e8
Merge "Port consoles extension API into v3 part1"
Merge "Port consoles extension API into v3 part2"
Merge "hyperv: Fix vmops.get_info raises InstanceNotFound KeyError"
Merge "test_xmlutil.py covers more code in xmlutil.py"
Merge "Add missing matchmaker_ring"
Merge "Sync latest rpc changes from oslo-incubator"
Merge "Misc fixes for v3 evacuate API extension"
Merge "port Deferred_delete API into v3 part1"
Add missing help messages for nova-manage command

Add help messages of agent and logs subcommand(nova-manage)

Change-Id: Ic9adea9de4eb5cbe3b6c611dac9e2fd549ff0610
Merge "Port quota classes extension to v3 API Part 2"