]> 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: 746a2a9 cdff256)
Merge PR #33795 into master
authorSage Weil <sage@redhat.com>
Sun, 8 Mar 2020 21:38:15 +0000 (16:38 -0500)
committerSage Weil <sage@redhat.com>
Sun, 8 Mar 2020 21:38:15 +0000 (16:38 -0500)
* refs/pull/33795/head:
mgr/orch: collapse 'SPEC' and 'PLACEMENT' columns in 'orch ls'

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/pybind/mgr/orchestrator/module.py patch | diff1 | diff2 | blob | history

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