From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 4 Aug 2017 18:47:38 +0000 (-0700)
Subject: Merge pull request #16675 from Jeegn-Chen/skip-err-entries
X-Git-Tag: v12.1.3~90
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a09e29ec2e9898ddec868c4802df3cc16d95143e;p=ceph.git

Merge pull request #16675 from Jeegn-Chen/skip-err-entries

osd/PGLog: skip ERROR entires in _merge_object_divergent_entries

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

a09e29ec2e9898ddec868c4802df3cc16d95143e