]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bc0fc8 deb8ea4)
Merge pull request #3973 from XinzeChi/wip-scrub-pending
authorSamuel Just <sam.just@inktank.com>
Mon, 22 Jun 2015 22:17:46 +0000 (15:17 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 22 Jun 2015 22:17:46 +0000 (15:17 -0700)
osd: check pending or active scrub before sched_scrub

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

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