]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48d007f a1e6dcd)
Merge pull request #7051 from wonzhq/scrub-cmp-map
authorSage Weil <sage@redhat.com>
Wed, 24 Feb 2016 19:35:38 +0000 (11:35 -0800)
committerSage Weil <sage@redhat.com>
Wed, 24 Feb 2016 19:35:38 +0000 (11:35 -0800)
osd: avoid FORCE updating digest been overwritten by MAYBE when comparing scrub map

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/PGBackend.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/PGBackend.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.