From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Feb 2020 18:58:51 +0000 (-0600)
Subject: Merge PR #33359 into master
X-Git-Tag: v15.1.1~362
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d66cc42d7e865b9ce05e08b02247f86c757d248d;p=ceph-ci.git

Merge PR #33359 into master

* refs/pull/33359/head:
	mgr/dashboard/tests/test_orchestrator: disable service test
	mgr/cephadm: fix race between check_hosts and host rm
	mgr/volumes: fix remove_mds call
	mgr/rook: hackly describe_service -> list_daemons
	mgr/tests/test_orchestrator: fix ServiceDescription test
	mgr/test_orchestrator: describe_service -> list_daemons
	mgr/orch: resurrect ServiceDescription, 'orch ls'
	qa/tasks/mgr/dashboard/test_orchestrator: disable services test

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

d66cc42d7e865b9ce05e08b02247f86c757d248d