]> 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: a1f3fdc e85197c)
Merge pull request #3318 from XinzeChi/wip-scrub
authorDavid Zafman <david.zafman@inktank.com>
Fri, 16 Jan 2015 18:36:41 +0000 (10:36 -0800)
committerDavid Zafman <david.zafman@inktank.com>
Fri, 16 Jan 2015 18:36:41 +0000 (10:36 -0800)
osd: support schedule scrub between some time defined by users

Reviewed-by David Zafman <dzafman@redhat.com>

1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/OSD.h patch | diff1 | diff2 | blob | history
src/test/Makefile.am patch | diff1 | diff2 | blob | history

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