Merge "Handle waiting for conductor in nova.service."
Merge "Add service_create to conductor."
Move network call from compute API to the manager

reboot gets network info from the network manager in the API only to pass
it to the manager.  This causes an un-needed delay on the API call.  It
also causes issues with cells, as with cells you should query the network
service close to that cell.

Fixes bug 1098741

Change-Id: If6badc007ad812e5539a3738911011685cf9df35
Merge "Make nova.service get service through conductor."
Merge "Add service_destroy to conductor."
Merge "Remove more unused opts from nova.scheduler.driver"
Merge "Added sample tests to FlavorSwap API."
Merge "xenapi: Remove dead code, moves, tests"
Merge "Fix lintstack check for multi-patch reviews"
Merge "Allow pinging own float when using fixed gateway"
Move migration_create() to conductor

This makes conductor able to create migrations and changes the
uses of migration_create() from compute/resource_tracker.py to
point at conductor.

Related to blueprint no-db-compute

Change-Id: Icd2288906fb03105b7a71f790353ae6d3dbaae62
Use testr setuptools commands.

Replace the embedded shell scripts with setuptools commands provided by
upstream. Cleans up a few warnings that this cause tox to show.

Change-Id: I9eb47142eafb6ed038b358b94984462ca1632542
Convert ConfigDriveHelper to being a context manager itself.

This is a little bit less awkward than the previous implementation,
and is based on a suggestion from Padraig Brady.

Change-Id: If8b09a41d21777a4bd56af16e1f7e02d61d1dd4e
instances_path is now defined here.

Remove comment which is now inaccurate.

Change-Id: Ie1aa2167ef2e53f0a1c90ec9727b3580bab8f851
Merge "Handle directory conflicts with html output."
Merge "Fix quota updating when admin deletes common user's instance"
Merge "Fix error in NovaBase.save() method"
Chown doesn't work on mounted vfat.

As reported by a user. Resolves bug 1092560.

Change-Id: I44c847d5e7f3242ca46a7436bcbc6e519baa88fc
Centralize instance directory logic.

This is the first step to being able to change the name of the instance
directories to something more unique than instance name.

Sneaks up on bug 1023865.

Change-Id: I1340a6b8644680325cba1e90a208e4be33ace6b4
Merge "Upgrade WebOb to 1.2.3"