Merge "NetApp: Fix issue with E-Series volume expand"

author Jenkins <jenkins@review.openstack.org>

Thu, 12 Nov 2015 19:21:18 +0000 (19:21 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 12 Nov 2015 19:21:18 +0000 (19:21 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 12 Nov 2015 19:21:18 +0000 (19:21 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 12 Nov 2015 19:21:18 +0000 (19:21 +0000)
diff --cc cinder/tests/unit/volume/drivers/netapp/eseries/test_library.py
Simple merge
diff --cc cinder/volume/drivers/netapp/eseries/library.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 12 Nov 2015 19:21:18 +0000 (19:21 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 12 Nov 2015 19:21:18 +0000 (19:21 +0000)
		1	2
cinder/tests/unit/volume/drivers/netapp/eseries/test_library.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/eseries/library.py	patch \|	diff1 \|	diff2 \|	blob \| history