]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33891 into octopus 33938/head
authorSage Weil <sage@redhat.com>
Fri, 13 Mar 2020 13:35:30 +0000 (08:35 -0500)
committerSage Weil <sage@redhat.com>
Fri, 13 Mar 2020 13:35:30 +0000 (08:35 -0500)
commitfcb1fd155fb02a931a66995904ad77f00f97ff82
tree8ce06da2fdcbd6f96dd1b3c74a10f2ae3bfdbd3e
parent863a9b109337f532d5488e09fae90fa37b827a93
parente2d940ef9677d12a7587ab13fd8e42b4545699d5
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>
src/pybind/mgr/cephadm/module.py