]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9613 from dzafman/wip-16064
authorKefu Chai <tchaikov@gmail.com>
Thu, 17 Nov 2016 07:48:32 +0000 (15:48 +0800)
committerGitHub <noreply@github.com>
Thu, 17 Nov 2016 07:48:32 +0000 (15:48 +0800)
common osd: Improve scrub analysis, list-inconsistent-obj output and osd-scrub-repair test

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
qa/workunits/ceph-helpers.sh
src/osd/PG.cc
src/osd/ReplicatedBackend.cc
src/osd/ReplicatedPG.cc
src/osd/osd_types.cc
src/osd/osd_types.h
src/test/osd/osd-scrub-repair.sh
src/tools/rados/rados.cc

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