Merge "Return XML message with objectserver 404."
Merge "Rename LLC to Foundation"
Merge "Deprecate CONF.fixed_range, do dynamic setup"
Merge "Remove instance['instance_type'] relationship from db api"
Sync rpc from oslo-incubator.

Changes include:

 * Fix Copyright Headers - Rename LLC to Foundation
 * Preserve exceptions in impl_zmq.
 * Don't log a traceback on rpc call timeout.
 * Redis-based matchmaker
 * AMQP: skip duplicate messages
 * some other minor fixes / cleanups

Fix bug 1154232.

Change-Id: I8afb6b9a919fca34b4a93f7fad1551a023eba6b2
Merge "Force resource updates to update updated_at"
Merge "Fixes nbd device can't be released error"
websockify 0.4 is busted

This was just released and it is broken, stalling our gates.  When
attempting to install it, we get:

"error: can't copy 'include/util.js': doesn't exist or not a regular
file"

Change-Id: I9d93bff92cc4a9d837382acce78bff587f52fb99
Add missing tests for db.block_device_mapping_* methods

There was no tests in test_db_api for block_device_mapping_* methods.
Add tests to ensure that all works. Also these tests allow us to refactor
work with session in these methods.

Fix bug in is_ephemeral we should return True or False not instance of
_sre.SRE_Match or None.

blueprint db-api-tests

Change-Id: I3cac17e7d2c8d0b2608fb9a78ea29210f025222b
Refactor work with session in db.block_device_mapping_* methods

Remove explicit use of session where it is not required.
Also this is small performance optimization, because if we put
session parameter to Models.save() method will create subtransaction.

blueprint db-session-cleanup

Change-Id: I6064f3df2daf0178009c4cf40da293f71ca6972a
Virtual Power Driver list running vms quoting error

This patch corrects a issue with VPD when configured for virsh the
list running vms function attempts to execute $2 instead of the actual
command.

Fixes Bug 1154280

Change-Id: I6d06cc58fb0f2935c4341761908b914106bda916
Authored-by: Chris Krelle <nobodycam@gmail.com>
Delete instance metadata when delete VM

* like everything else instance metadata is just soft deleted.
* This doesn't soft delete instance_system_metadata (bug 1153827)

Fix bug 1092408

Change-Id: Iebc2c7e055a110e5067829569127a272a1a92a87
Make run_instance() bail quietly if instance has been deleted

Right now, we make a big mess in the logs if someone deletes an
instance before we get a chance to run it. This cleans that up
to a single warning message.

Fixes bug 1154292

Change-Id: I2de0c2993d6a16d9482878eee4eef10bfd78c3e6
Merge "websockify 0.4 is busted"
List ConsoleTypeInvalid as a client exception.

get_vnc_console() and get_spice_console() in nova.compute.manager should
list ConsoleTypeInvalid as a client exception for rpc. This prevents the
rpc layer from logging a traceback for this exception when raised. It is
an expected type of exception that the client should be left to handle
how it would like.

Fix bug 1154301.

Change-Id: I3a359cbb4edbfabea1775e927b6f9947db26a284
Don't load system_metadata when it isn't joined.

If we always load system_metadata, it will throw a sqlalchemy
error if it isn't joined in the column. Rather than putting it
in extra keys we need to explicitly join it if it is missing.

Adds a test to make sure that system_metadata is returned
properly from the migration call even though the extra keys
parameter was removed.

Fixes bug 1146000

Change-Id: I05365906ed528a06fe5704449dab72c857fefa65
Merge "Compile BigInteger to INTEGER for sqlite"
Fix cells instance deletion

Instance delete and soft_delete are broken with cells when the API
doesn't know the cell of an instance.  A traceback occurs in all child
cells.  Also: soft_delete results in a 'hard' type being sent to
child cells vs 'soft'.

Fixes bug 1154333

Change-Id: I13ac839fa13a66caa100a3459bcc8e1183821ff1
Merge "Fix quota issues with instance deletes."
Lazy load CONF.quota_driver.

nova.quota is imported before config options are parsed and it looks at
CONF.quota_driver on module-load.  This changes it so we look at
CONF.quota_driver post-module-load.

Fixes bug 1154371

Change-Id: Ia2e63a7aeab2234be683ff507e7856d46601a9a8