Merge pull request #6199 from liewegas/wip-randomize-scrub-hammer

author Loic Dachary <loic@dachary.org>

Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)

committer Loic Dachary <loic@dachary.org>

Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)
author Loic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)
committer Loic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)
diff --cc src/common/config_opts.h
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
author	Loic Dachary <loic@dachary.org>
	Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)
committer	Loic Dachary <loic@dachary.org>
	Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history