Merge "Switch create volume commands to Taskflow 0.1.1"

author Jenkins <jenkins@review.openstack.org>

Sat, 14 Dec 2013 05:55:24 +0000 (05:55 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 14 Dec 2013 05:55:24 +0000 (05:55 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 14 Dec 2013 05:55:24 +0000 (05:55 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 14 Dec 2013 05:55:24 +0000 (05:55 +0000)
diff --cc cinder/volume/manager.py
Simple merge
diff --cc requirements.txt
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 14 Dec 2013 05:55:24 +0000 (05:55 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 14 Dec 2013 05:55:24 +0000 (05:55 +0000)
		1	2
cinder/volume/manager.py	patch \|	diff1 \|	diff2 \|	blob \| history
requirements.txt	patch \|	diff1 \|	diff2 \|	blob \| history