Merge pull request #6827 from trociny/wip-scrub-debug

author Kefu Chai <tchaikov@gmail.com>

Fri, 11 Dec 2015 15:28:11 +0000 (23:28 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Fri, 11 Dec 2015 15:28:11 +0000 (23:28 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 11 Dec 2015 15:28:11 +0000 (23:28 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Fri, 11 Dec 2015 15:28:11 +0000 (23:28 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 11 Dec 2015 15:28:11 +0000 (23:28 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Fri, 11 Dec 2015 15:28:11 +0000 (23:28 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history