Merge pull request #9980 from gaowanlong/split_out_handle_pg_scrub

author Kefu Chai <tchaikov@gmail.com>

Fri, 15 Jul 2016 09:09:14 +0000 (17:09 +0800)

committer GitHub <noreply@github.com>

Fri, 15 Jul 2016 09:09:14 +0000 (17:09 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 15 Jul 2016 09:09:14 +0000 (17:09 +0800)
committer GitHub <noreply@github.com>
Fri, 15 Jul 2016 09:09:14 +0000 (17:09 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 15 Jul 2016 09:09:14 +0000 (17:09 +0800)
committer	GitHub <noreply@github.com>
	Fri, 15 Jul 2016 09:09:14 +0000 (17:09 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history