Merge "Fix database poison warnings, part 21"

author Jenkins <jenkins@review.openstack.org>

Fri, 28 Oct 2016 07:57:19 +0000 (07:57 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 28 Oct 2016 07:57:19 +0000 (07:57 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 28 Oct 2016 07:57:19 +0000 (07:57 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 28 Oct 2016 07:57:19 +0000 (07:57 +0000)
diff --cc nova/tests/unit/compute/test_compute_api.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 28 Oct 2016 07:57:19 +0000 (07:57 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 28 Oct 2016 07:57:19 +0000 (07:57 +0000)