From: Sage Weil <sage@redhat.com>
Date: Sat, 28 Mar 2020 00:59:14 +0000 (-0500)
Subject: Merge PR #34204 into octopus
X-Git-Tag: v15.2.1~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39a4a7a33f17a58fac8ae9ea1e9343aa31640063;p=ceph.git

Merge PR #34204 into octopus

* refs/pull/34204/head:
	osd/PeeringState: drop mimic assert

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

39a4a7a33f17a58fac8ae9ea1e9343aa31640063