]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33968 into octopus
authorSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 02:26:20 +0000 (21:26 -0500)
committerSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 02:26:20 +0000 (21:26 -0500)
* refs/pull/33968/head:
mgr/cephadm: do not include 'osd' service in 'orch ls' output

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge