From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 00:58:00 +0000 (-0600)
Subject: Merge PR #33766 into master
X-Git-Tag: v15.1.1~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77425b3c4abb4e663dae59c3b72684200f4eb77c;p=ceph.git

Merge PR #33766 into master

* refs/pull/33766/head:
	mgr/cephadm: fix placement when existing + specified don't overlap

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

77425b3c4abb4e663dae59c3b72684200f4eb77c