From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 21 Oct 2020 20:33:21 +0000 (-0700)
Subject: Merge PR #37717 into master
X-Git-Tag: v16.1.0~798
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e32cdd28b11a413aa48f231a40f88e33f1f86282;p=ceph.git

Merge PR #37717 into master

* refs/pull/37717/head:
	doc/cephfs: add sample cephfs-shell.conf

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

e32cdd28b11a413aa48f231a40f88e33f1f86282