From: Sage Weil <sage@redhat.com>
Date: Thu, 5 Mar 2020 19:20:21 +0000 (-0600)
Subject: Merge PR #33531 into master
X-Git-Tag: v15.1.1~96
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a84ddeaa8ddaa72ae16ef1edeefc56dfb837ef2;p=ceph.git

Merge PR #33531 into master

* refs/pull/33531/head:
	qa/tasks/mgr/test_orchestrator_cli: fix test_ps* tests
	mgr/test_orchestrator: refactor listing services/daemons
	mgr/dashboard: list services and daemons

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

8a84ddeaa8ddaa72ae16ef1edeefc56dfb837ef2