]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6558f42 6421f6a)
Merge PR #33667 into master
authorSage Weil <sage@redhat.com>
Tue, 3 Mar 2020 21:59:33 +0000 (15:59 -0600)
committerSage Weil <sage@redhat.com>
Tue, 3 Mar 2020 21:59:33 +0000 (15:59 -0600)
* refs/pull/33667/head:
mgr/orch: show placement in 'orch ls'
mgr/orch: fix SPEC alignment in 'orch ls'
mgr/orch: include spec ref in ServiceDescription

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

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