Merge "NetApp check for 7 mode controller version"

author Jenkins <jenkins@review.openstack.org>

Mon, 23 Sep 2013 06:20:05 +0000 (06:20 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 23 Sep 2013 06:20:05 +0000 (06:20 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 23 Sep 2013 06:20:05 +0000 (06:20 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 23 Sep 2013 06:20:05 +0000 (06:20 +0000)
diff --cc cinder/tests/test_netapp.py
Simple merge
diff --cc cinder/tests/test_netapp_nfs.py
Simple merge
diff --cc cinder/volume/drivers/netapp/iscsi.py
Simple merge
diff --cc cinder/volume/drivers/netapp/nfs.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 23 Sep 2013 06:20:05 +0000 (06:20 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 23 Sep 2013 06:20:05 +0000 (06:20 +0000)
		1	2
cinder/tests/test_netapp.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/test_netapp_nfs.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/iscsi.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/nfs.py	patch \|	diff1 \|	diff2 \|	blob \| history