From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 18 Jul 2020 03:30:42 +0000 (-0700)
Subject: Merge PR #36134 into master
X-Git-Tag: v16.1.0~1686
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fef026da0521820d2a35d175a8ea40409a4684f;p=ceph.git

Merge PR #36134 into master

* 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>
---

4fef026da0521820d2a35d175a8ea40409a4684f