From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 8 Jul 2020 19:34:20 +0000 (-0700)
Subject: Merge pull request #35793 from callithea/wip-46183-octopus
X-Git-Tag: v15.2.5~159
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9aae01ff466165047d8740a77dbfe803be0216b6;p=ceph.git

Merge pull request #35793 from callithea/wip-46183-octopus

octopus: mgr/DaemonServer.cc: make 'config show' on fsid work

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

9aae01ff466165047d8740a77dbfe803be0216b6