Merge "[proxy-api] microversion 2.39 deprecates image-metadata proxy API"

author Jenkins <jenkins@review.openstack.org>

Wed, 7 Dec 2016 21:17:03 +0000 (21:17 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 7 Dec 2016 21:17:03 +0000 (21:17 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 7 Dec 2016 21:17:03 +0000 (21:17 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 7 Dec 2016 21:17:03 +0000 (21:17 +0000)
diff --cc api-ref/source/parameters.yaml
Simple merge
diff --cc nova/api/openstack/compute/servers.py
Simple merge
diff --cc nova/tests/unit/api/openstack/compute/test_serversV21.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 7 Dec 2016 21:17:03 +0000 (21:17 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 7 Dec 2016 21:17:03 +0000 (21:17 +0000)
		1	2
api-ref/source/parameters.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
nova/api/openstack/compute/servers.py	patch \|	diff1 \|	diff2 \|	blob \| history
nova/tests/unit/api/openstack/compute/test_serversV21.py	patch \|	diff1 \|	diff2 \|	blob \| history