Merge "NetApp: Fix issue with updating E-Series password"

author Jenkins <jenkins@review.openstack.org>

Fri, 13 Nov 2015 19:05:57 +0000 (19:05 +0000)

committer Gerrit Code Review <review@openstack.org>

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