]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 002c7e7 173116f)
Merge pull request #1476 from ceph/wip-scrub-lock
authorSamuel Just <sam.just@inktank.com>
Wed, 19 Mar 2014 17:46:32 +0000 (10:46 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 19 Mar 2014 17:46:32 +0000 (10:46 -0700)
osd: do not queue scrub for non-primary

Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/PG.cc patch | diff1 | diff2 | blob | history

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