From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 24 Mar 2021 01:45:48 +0000 (-0700)
Subject: Merge PR #40305 into master
X-Git-Tag: v17.1.0~2500
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b4a7668f195c3f5f33ec05d13c17b83d3032cee;p=ceph.git

Merge PR #40305 into master

* refs/pull/40305/head:
	doc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port

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

5b4a7668f195c3f5f33ec05d13c17b83d3032cee