]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitc74d7a06671e4b198acc67b4a2a0e5f653c0a428
treeacf25d0fbbd7ba8e1b9aa8971dd4a7733e145b41
parent9194a33adb1cf9cc5b90927ec2a6b4f8f142de2b
parentf363a69e5efb2302022d6e32debe44215c8564f1
Merge PR #33968 into octopus

* refs/pull/33968/head:
mgr/cephadm: do not include 'osd' service in 'orch ls' output

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