Merge pull request #14886 from badone/wip-async-osd-scrub-sleep

author Kefu Chai <tchaikov@gmail.com>

Tue, 9 May 2017 12:27:17 +0000 (20:27 +0800)

committer GitHub <noreply@github.com>

Tue, 9 May 2017 12:27:17 +0000 (20:27 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 9 May 2017 12:27:17 +0000 (20:27 +0800)
committer GitHub <noreply@github.com>
Tue, 9 May 2017 12:27:17 +0000 (20:27 +0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 9 May 2017 12:27:17 +0000 (20:27 +0800)
committer	GitHub <noreply@github.com>
	Tue, 9 May 2017 12:27:17 +0000 (20:27 +0800)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history