]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6199 from liewegas/wip-randomize-scrub-hammer
authorLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)
committerLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)
osd: randomize scrub times

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc

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