]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
osd/PGLog: skip ERROR entires in _merge_object_divergent_entries

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/PGLog.h

diff --cc src/osd/PGLog.h
Simple merge