]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15635 from dzafman/wip-13837
authorJosh Durgin <jdurgin@redhat.com>
Wed, 28 Jun 2017 19:32:04 +0000 (12:32 -0700)
committerGitHub <noreply@github.com>
Wed, 28 Jun 2017 19:32:04 +0000 (12:32 -0700)
osd: Corrupt objects stop snaptrim and mark pg snaptrim_error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/mon/PGMap.cc
src/osd/PG.cc
src/osd/PrimaryLogPG.cc
src/osd/osd_types.cc

Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge
Simple merge