]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf8bd9a7dddf2a328b28860c9f10cb6ab80bc95ab
tree45fd4f292362eb404b2b2f48afab1ed70814ee82tree | snapshot
parent6558f4211046be32635266107b2eba7139d93cc6commit | diff
parent6421f6a5a20638c85921f80e8ce79b065298a75acommit | diff
Merge PR #33667 into master

* 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>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
src/pybind/mgr/orchestrator/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.