From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 20 May 2020 16:15:24 +0000 (-0700)
Subject: Merge PR #33286 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1227
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d2b7899aa40b1317de9948cccb5e746cd6c576fc;p=ceph-ci.git

Merge PR #33286 into master

* refs/pull/33286/head:
	cephfs-shell: support cephfs-shell.conf

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

d2b7899aa40b1317de9948cccb5e746cd6c576fc