]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #36351 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 11 Aug 2020 22:55:52 +0000 (15:55 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 11 Aug 2020 22:55:52 +0000 (15:55 -0700)
* refs/pull/36351/head:
qa/tasks/cephfs/nfs: Add tests for cluster config set and reset
doc/cephfs/nfs: Update the doc about 'reset' and 'set' config interfaces
mgr/volumes/nfs: Add interface for adding user defined configuration

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

Trivial merge