From: Sage Weil <sage@newdream.net>
Date: Tue, 10 Aug 2021 14:36:37 +0000 (-0400)
Subject: Merge PR #42680 into master
X-Git-Tag: v17.1.0~1151
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1fd64a3537ffaa43e7c5c30597aebeac00cf2abf;p=ceph.git

Merge PR #42680 into master

* refs/pull/42680/head:
	src/pybind/mgr/nfs/tests: pass cluster_id to from_export_block()
	src/pybind/mgr/nfs: remove `tag` option
	src/pybind/mgr/nfs: remove per daemon config test
	src/pybind/mgr/nfs: directly use cluster_id and remove daemon related stuff

Reviewed-by: Sage Weil <sage@redhat.com>
---

1fd64a3537ffaa43e7c5c30597aebeac00cf2abf