]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #38913 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 10 Mar 2021 15:01:27 +0000 (07:01 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 10 Mar 2021 15:01:27 +0000 (07:01 -0800)
* refs/pull/38913/head:
qa/tasks/cephfs/nfs: Add tests for updating fs exports
mgr/volumes/nfs: Handle rook restart error
doc/cephfs/nfs: Add about update export interface
mgr/volumes/nfs: Add command to update cephfs exports
pybind/volumes/nfs: set mds caps according to user specified access type
mgr/volumes/module: Remove unused json module

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge