]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27288 into master
authorSage Weil <sage@redhat.com>
Mon, 22 Apr 2019 02:28:02 +0000 (21:28 -0500)
committerSage Weil <sage@redhat.com>
Mon, 22 Apr 2019 02:28:02 +0000 (21:28 -0500)
* 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>

Trivial merge