From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Mar 2020 22:19:20 +0000 (-0500)
Subject: Merge PR #33853 into octopus
X-Git-Tag: v15.1.1~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6542f1459111a7b28da9198d99bf9c7e4d56329d;p=ceph.git

Merge PR #33853 into octopus

* refs/pull/33853/head:
	mgr/cephadm: Make sure we don't co-locate the same daemon

Reviewed-by: Sage Weil <sage@redhat.com>
---

6542f1459111a7b28da9198d99bf9c7e4d56329d