From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Mar 2020 19:33:35 +0000 (-0500)
Subject: Merge PR #34023 into octopus
X-Git-Tag: v15.2.0~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eab56bf5ef978ff3ef52addbb88d3164ae935da5;p=ceph.git

Merge PR #34023 into octopus

* refs/pull/34023/head:
	mgr/test_orchestrator: fix service filtering when using dummy data
	mgr/dashboard: fix adding/removing host errors

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
---

eab56bf5ef978ff3ef52addbb88d3164ae935da5