]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 863a9b1 e2d940e)
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)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.