]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7702 from ceph/wip-14077-hammer
authorLoic Dachary <loic@dachary.org>
Thu, 3 Mar 2016 04:51:33 +0000 (11:51 +0700)
committerLoic Dachary <loic@dachary.org>
Thu, 3 Mar 2016 04:51:33 +0000 (11:51 +0700)
hammer: scrub bogus results when missing a clone

Reviewed-by: Martin Palma <martin@palma.bz>
Reviewed-by: Wei-Chung Cheng <freeze.vicente.cheng@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/PG.cc

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