]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #36134 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:30:42 +0000 (20:30 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:30:42 +0000 (20:30 -0700)
* refs/pull/36134/head:
mgr/nfs: Remove NParts and Cache_Size from MDCACHE block

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

Trivial merge