]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #42680 into master
authorSage Weil <sage@newdream.net>
Tue, 10 Aug 2021 14:36:37 +0000 (10:36 -0400)
committerSage Weil <sage@newdream.net>
Tue, 10 Aug 2021 14:36:37 +0000 (10:36 -0400)
* 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>

Trivial merge