]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33286 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 20 May 2020 16:15:24 +0000 (09:15 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 20 May 2020 16:15:24 +0000 (09:15 -0700)
* refs/pull/33286/head:
cephfs-shell: support cephfs-shell.conf

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

Trivial merge