Merge "Clone_image method added image_id as parameter."

author Jenkins <jenkins@review.openstack.org>

Tue, 13 Aug 2013 16:37:43 +0000 (16:37 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 13 Aug 2013 16:37:43 +0000 (16:37 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 13 Aug 2013 16:37:43 +0000 (16:37 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 13 Aug 2013 16:37:43 +0000 (16:37 +0000)
diff --cc cinder/volume/drivers/lvm.py
Simple merge
diff --cc cinder/volume/drivers/rbd.py
Simple merge
diff --cc cinder/volume/drivers/scality.py
Simple merge
diff --cc cinder/volume/flows/create_volume.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 13 Aug 2013 16:37:43 +0000 (16:37 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 13 Aug 2013 16:37:43 +0000 (16:37 +0000)
		1	2
cinder/volume/drivers/lvm.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/rbd.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/scality.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/flows/create_volume.py	patch \|	diff1 \|	diff2 \|	blob \| history