From: Sage Weil <sage@redhat.com>
Date: Mon, 22 Apr 2019 02:28:02 +0000 (-0500)
Subject: Merge PR #27288 into master
X-Git-Tag: v15.1.0~2882
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=191ab33faf47ac2b3beaaec7c10d07c48ab24349;p=ceph.git

Merge PR #27288 into master

* refs/pull/27288/head:
	osd/PG: discover missing objects when an OSD peers and PG is degraded

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

191ab33faf47ac2b3beaaec7c10d07c48ab24349