Merge "NetApp: volume resize using clone fails with QoS"

author Jenkins <jenkins@review.openstack.org>

Thu, 10 Mar 2016 17:08:42 +0000 (17:08 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 10 Mar 2016 17:08:43 +0000 (17:08 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 10 Mar 2016 17:08:42 +0000 (17:08 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 10 Mar 2016 17:08:43 +0000 (17:08 +0000)
diff --cc cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_base.py
Simple merge
diff --cc cinder/volume/drivers/netapp/dataontap/block_base.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 10 Mar 2016 17:08:42 +0000 (17:08 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 10 Mar 2016 17:08:43 +0000 (17:08 +0000)
		1	2
cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_base.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/dataontap/block_base.py	patch \|	diff1 \|	diff2 \|	blob \| history