]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit463bb3d2ef6b4461fbbb189498eeed4828c89ab2
tree981166a3df7e38abbefc55af4f1238aeafbd705e
parent648f9e11a627508296f8f676bd4fde7f78ba27b8
parent58d9e90425679fd715aa31d7c8f1044f4582388e
Merge PR #40736 into master

* 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>
src/pybind/mgr/cephadm/module.py