Merge "NetApp fix vol migration unusability"

author Jenkins <jenkins@review.openstack.org>

Mon, 8 Dec 2014 19:12:36 +0000 (19:12 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 8 Dec 2014 19:12:36 +0000 (19:12 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 8 Dec 2014 19:12:36 +0000 (19:12 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 8 Dec 2014 19:12:36 +0000 (19:12 +0000)
diff --cc cinder/tests/test_netapp_eseries_iscsi.py
Simple merge
diff --cc cinder/volume/drivers/netapp/eseries/iscsi.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 8 Dec 2014 19:12:36 +0000 (19:12 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 8 Dec 2014 19:12:36 +0000 (19:12 +0000)
		1	2
cinder/tests/test_netapp_eseries_iscsi.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/eseries/iscsi.py	patch \|	diff1 \|	diff2 \|	blob \| history