From: Patrick Donnelly Date: Wed, 10 Mar 2021 15:01:27 +0000 (-0800) Subject: Merge PR #38913 into master X-Git-Tag: v17.1.0~2662 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b506bbe4e0bdefac2133c01cf6398f6e03bc9f1;p=ceph.git Merge PR #38913 into master * 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 Reviewed-by: Patrick Donnelly --- 4b506bbe4e0bdefac2133c01cf6398f6e03bc9f1