From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Mar 2020 13:35:30 +0000 (-0500)
Subject: Merge PR #33891 into octopus
X-Git-Tag: v15.1.1~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fcb1fd155fb02a931a66995904ad77f00f97ff82;p=ceph.git

Merge PR #33891 into octopus

* refs/pull/33891/head:
	mgr/cephadm: fix dump output by formatting to json first

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

fcb1fd155fb02a931a66995904ad77f00f97ff82