]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 648f9e1 58d9e90)
Merge PR #40736 into master
authorSage Weil <sage@newdream.net>
Mon, 12 Apr 2021 15:45:50 +0000 (11:45 -0400)
committerSage Weil <sage@newdream.net>
Mon, 12 Apr 2021 15:45:50 +0000 (11:45 -0400)
* refs/pull/40736/head:
mgr/cephadm: rewrite/simplify describe_service
mgr/orchestrator: report osds as osd.unmanaged as appropriate
mgr/orchestrator: remove IMAGE ID from 'orch ls'

Reviewed-by: Michael Fritch <mfritch@suse.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.