Merge "NetApp ONTAP: Add debug tracing"

author Jenkins <jenkins@review.openstack.org>

Mon, 13 Jul 2015 20:25:50 +0000 (20:25 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 13 Jul 2015 20:25:50 +0000 (20:25 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 13 Jul 2015 20:25:50 +0000 (20:25 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 13 Jul 2015 20:25:50 +0000 (20:25 +0000)
diff --cc cinder/volume/drivers/netapp/dataontap/nfs_base.py
Simple merge
diff --cc cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 13 Jul 2015 20:25:50 +0000 (20:25 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 13 Jul 2015 20:25:50 +0000 (20:25 +0000)
		1	2
cinder/volume/drivers/netapp/dataontap/nfs_base.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/dataontap/nfs_cmode.py	patch \|	diff1 \|	diff2 \|	blob \| history