Merge "Volume extend error does not catch exception"

author Jenkins <jenkins@review.openstack.org>

Fri, 16 Oct 2015 23:13:17 +0000 (23:13 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 16 Oct 2015 23:13:17 +0000 (23:13 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 16 Oct 2015 23:13:17 +0000 (23:13 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 16 Oct 2015 23:13:17 +0000 (23:13 +0000)
diff --cc cinder/tests/unit/api/contrib/test_volume_actions.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 16 Oct 2015 23:13:17 +0000 (23:13 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 16 Oct 2015 23:13:17 +0000 (23:13 +0000)