]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #16675 from Jeegn-Chen/skip-err-entries
authorJosh Durgin <jdurgin@redhat.com>
Fri, 4 Aug 2017 18:47:38 +0000 (11:47 -0700)
committerGitHub <noreply@github.com>
Fri, 4 Aug 2017 18:47:38 +0000 (11:47 -0700)
commita09e29ec2e9898ddec868c4802df3cc16d95143e
treeb7016e171305fe3ba05db517ec27df1579379c12
parent91ad2e6423eeca76a3c86305f8a4bbbc22ffed4c
parent0eea622d920b6a8bee32e204c81ab267c7788a06
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>
src/osd/PGLog.h