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

Merge PR #34123 into octopus

* refs/pull/34123/head:
	osd/PeeringState: fix pending want_acting vs osd offline race

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

71260dea5853c12804f292170e17a1306f76f5ff