Merge "Use nfs_oversub_ratio when reporting pool capacity"

author Jenkins <jenkins@review.openstack.org>

Tue, 26 May 2015 02:32:54 +0000 (02:32 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 26 May 2015 02:32:54 +0000 (02:32 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 26 May 2015 02:32:54 +0000 (02:32 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 26 May 2015 02:32:54 +0000 (02:32 +0000)
diff --cc cinder/volume/drivers/netapp/dataontap/client/client_7mode.py
Simple merge
diff --cc cinder/volume/drivers/netapp/dataontap/nfs_base.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 26 May 2015 02:32:54 +0000 (02:32 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 26 May 2015 02:32:54 +0000 (02:32 +0000)
		1	2
cinder/volume/drivers/netapp/dataontap/client/client_7mode.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/netapp/dataontap/nfs_base.py	patch \|	diff1 \|	diff2 \|	blob \| history