Merge "Add entry create and cast tasks to manage workflow"

author Jenkins <jenkins@review.openstack.org>

Fri, 7 Aug 2015 00:05:31 +0000 (00:05 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 7 Aug 2015 00:05:31 +0000 (00:05 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 7 Aug 2015 00:05:31 +0000 (00:05 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 7 Aug 2015 00:05:31 +0000 (00:05 +0000)
diff --cc cinder/exception.py
Simple merge
diff --cc cinder/volume/api.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 7 Aug 2015 00:05:31 +0000 (00:05 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 7 Aug 2015 00:05:31 +0000 (00:05 +0000)
		1	2
cinder/exception.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/api.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history