From: Xie Xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 14 Jan 2020 08:50:55 +0000 (+0800)
Subject: Merge pull request #29669 from cqzcqq/fix-40117
X-Git-Tag: v15.1.0~239
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65c593991d024e869b61d7b3ef0badb18e5d4310;p=ceph.git

Merge pull request #29669 from cqzcqq/fix-40117

osd/PeeringState.h: Fix pg stuck in WaitActingChange

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

65c593991d024e869b61d7b3ef0badb18e5d4310