Merge "Fix thin provisioning flags in NetApp drivers"

author Jenkins <jenkins@review.openstack.org>

Thu, 28 Jan 2016 20:05:34 +0000 (20:05 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 28 Jan 2016 20:05:35 +0000 (20:05 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 28 Jan 2016 20:05:34 +0000 (20:05 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 28 Jan 2016 20:05:35 +0000 (20:05 +0000)
diff --cc cinder/tests/unit/volume/drivers/netapp/dataontap/fakes.py
Simple merge
diff --cc cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_7mode.py
Simple merge
diff --cc cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_cmode.py
Simple merge
diff --cc cinder/volume/drivers/netapp/dataontap/block_7mode.py
Simple merge
diff --cc cinder/volume/drivers/netapp/dataontap/block_cmode.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 28 Jan 2016 20:05:34 +0000 (20:05 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 28 Jan 2016 20:05:35 +0000 (20:05 +0000)
		1	2
cinder/tests/unit/volume/drivers/netapp/dataontap/fakes.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_7mode.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_cmode.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/dataontap/block_7mode.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/dataontap/block_cmode.py	patch \|	diff1 \|	diff2 \|	blob \| history