Merge "Placement api: Add informative message to 404 response."

author Jenkins <jenkins@review.openstack.org>

Fri, 25 Nov 2016 21:12:55 +0000 (21:12 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 25 Nov 2016 21:12:56 +0000 (21:12 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 25 Nov 2016 21:12:55 +0000 (21:12 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 25 Nov 2016 21:12:56 +0000 (21:12 +0000)
diff --cc nova/api/openstack/placement/handlers/inventory.py
Simple merge
diff --cc nova/tests/functional/api/openstack/placement/gabbits/inventory.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 25 Nov 2016 21:12:55 +0000 (21:12 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 25 Nov 2016 21:12:56 +0000 (21:12 +0000)
		1	2
nova/api/openstack/placement/handlers/inventory.py	patch \|	diff1 \|	diff2 \|	blob \| history
nova/tests/functional/api/openstack/placement/gabbits/inventory.yaml	patch \|	diff1 \|	diff2 \|	blob \| history