Merge "Create volume revert fails for non admin user"

author Jenkins <jenkins@review.openstack.org>

Wed, 2 Oct 2013 13:54:49 +0000 (13:54 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 2 Oct 2013 13:54:49 +0000 (13:54 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 2 Oct 2013 13:54:49 +0000 (13:54 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 2 Oct 2013 13:54:49 +0000 (13:54 +0000)
diff --cc cinder/volume/flows/create_volume/__init__.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 2 Oct 2013 13:54:49 +0000 (13:54 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 2 Oct 2013 13:54:49 +0000 (13:54 +0000)