From: Sage Weil <sage@redhat.com>
Date: Sun, 22 Mar 2020 15:55:54 +0000 (-0500)
Subject: Merge PR #34067 into octopus
X-Git-Tag: v15.2.0~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b28477f0d65412ec0ed3c3d698a3aeaad45099c;p=ceph.git

Merge PR #34067 into octopus

* refs/pull/34067/head:
	mgr/DaemonServer: add explicit check that acting matches for merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

3b28477f0d65412ec0ed3c3d698a3aeaad45099c