From: Kefu Chai <kchai@redhat.com>
Date: Sat, 16 Jan 2021 06:57:47 +0000 (+0800)
Subject: Merge pull request #38880 from xxhdx1985126/wip-crimson-bug-fix
X-Git-Tag: v16.1.0~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9280858e9fc1bfb270256febe37c17d78ff0e138;p=ceph.git

Merge pull request #38880 from xxhdx1985126/wip-crimson-bug-fix

crimson/osd: make PGRecovery::start_primary_recovery_ops take objs recovered by UrgentRecovery into account

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

9280858e9fc1bfb270256febe37c17d78ff0e138