]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3739 from athanatos/wip-10840
authorSage Weil <sage@redhat.com>
Mon, 16 Feb 2015 17:08:11 +0000 (09:08 -0800)
committerSage Weil <sage@redhat.com>
Mon, 16 Feb 2015 17:08:11 +0000 (09:08 -0800)
PG,ReplicatedPG: make missing_digests local to scrub_compare_maps

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

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