Merge "Add a comment to placeholder migrations."
Fixes argument order of quantumv2.api.get_instance_nw_info

Fixes bug #1159042

Change-Id: I04136707cdf2ca716dabd92aa7a471c291a3b4eb
Make iptables drop action configurable.

Resolves bug 1013893 by allowing the setting of the iptables drop
action with a configuration flag. It is expected that this would be
used for run a LOGDROP action before actually dropping the packet.

DocImpact: the drop action for iptables rules can now be configured
for nova-network users with the iptables_drop_action flag.

Change-Id: I15720d2742955611929a4d7181a269795296e025
Merge "Make _downsize_quota_delta() use stashed instance types"
Merge "Remove outdated try except block in ec2 code"
disable colorizer as it swallows fails

while the colorizer is pretty, it has the problem that fail output
actually gets completely swallowed when it is turned on.

Revert the use in run_tests.sh for now until it can be sorted out
so we don't prevent people from using run_tests.sh to do development.

Fixes bug #1159116

Change-Id: I3e6dfdc03c7b033ff132c00a51a368dae9789266
Merge "Reset ec2 image cache between S3 tests."
Fixes Nova API /os-hosts missing element "zone"

Now the HostIndexTemplate of Nova /os-hosts API is missing element "zone",
which will cause the XML output of list hosts missing the zone attribute.

Fixes bug: 1159055

Change-Id: I9940efcfd364c35b00cde4398d531d7ff56dc2b9
Merge "disable colorizer as it swallows fails"
Imported Translations from Transifex

Change-Id: I0ee0df11849df41d9bbecd846c86813c67a6c779
Reformat openstack-common.conf

Use the new 'module' option in openstack-common.conf which is a
multi-string option, allowing each module name to be placed on a
separate line.

This makes it much easier to review changes to the modules list.

Change-Id: I218601a3720287071f05b9f2f624c1de4442d34f
Merge "Don't log traceback on rpc timeout."
Merge "Sync rpc from oslo-incubator."
Merge "Sync everything from oslo-incubator."
xenapi: Retrieve VM uuid from xenstore.

Fall back to retrieving the uuid from xenstore if
/sys/hypervisor/uuid isn't accessible.

Change-Id: I409079068d3102ff86a71431b29c1ce2e6fe8857
Fixes: bug #1157211
Merge "xenapi: fix console for rescued instance"
Avoid using whitespace in test_safe_parse_xml.

Updates our MiscellaneousXMLUtilTests.test_safe_parse_xml test
so that it avoids using and ignores whitespace. This works around some
minidom parsing differences that can happen with some versions of python
2.6.

Fixes LP Bug #1158826.

Change-Id: Iada0b095ab3b5ac6dc026b3ff6cdfb175f1e20a7
Do not test foreign keys with SQLite version < 3.7

Fixes bug 1158828

Even though SQLAlchemy is documented to support foreign keys (with
the pragma set) on SQLite >= 3.6.19, we're seeing consistent problems
with that support on RHEL 6.4 with SQLite 3.6.20.  It works fine on
Fedora and Ubuntu with SQLite 3.7.x.

To work around these problems, if we're using SQLite, test the SQLite
version inside the test that requires foreign key support,
and skip the test if it's < 3.7

Change-Id: I1c26f29371376b271a4e384ea7b5d2009651acc1
Include Co-authored-by entries in AUTHORS

Import latest openstack.common.setup from oslo-incubator, which includes
the fix to include Co-authored-by entries in AUTHORS.

Fixes bug 1158319

Change-Id: I4f0ba09816730d10869c4ca639e2930d266eac8f
Merge "Pass project id in quantum driver secgroup list"