From: Kefu Chai <kchai@redhat.com>
Date: Sun, 24 Nov 2019 16:58:14 +0000 (+0800)
Subject: Merge pull request #31703 from xiexingguo/wip-42577-plus
X-Git-Tag: v15.1.0~775
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=819ccfdcd7e06c935510e0552fdf7f9d2aa353f9;p=ceph.git

Merge pull request #31703 from xiexingguo/wip-42577-plus

osd/PeeringState: do not exclude up from acting_recovery_backfill

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

819ccfdcd7e06c935510e0552fdf7f9d2aa353f9