Merge "Check for service existance in capabilities API"

author Jenkins <jenkins@review.openstack.org>

Mon, 29 Feb 2016 16:46:08 +0000 (16:46 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 29 Feb 2016 16:46:08 +0000 (16:46 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 29 Feb 2016 16:46:08 +0000 (16:46 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 29 Feb 2016 16:46:08 +0000 (16:46 +0000)
diff --cc cinder/api/contrib/capabilities.py
Simple merge
diff --cc cinder/exception.py
Simple merge
diff --cc cinder/tests/unit/api/contrib/test_capabilities.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 29 Feb 2016 16:46:08 +0000 (16:46 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 29 Feb 2016 16:46:08 +0000 (16:46 +0000)
		1	2
cinder/api/contrib/capabilities.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/exception.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/unit/api/contrib/test_capabilities.py	patch \|	diff1 \|	diff2 \|	blob \| history