Merge pull request #19486 from liewegas/wip-22419

author Kefu Chai <tchaikov@gmail.com>

Sat, 16 Dec 2017 04:29:15 +0000 (12:29 +0800)

committer GitHub <noreply@github.com>

Sat, 16 Dec 2017 04:29:15 +0000 (12:29 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 16 Dec 2017 04:29:15 +0000 (12:29 +0800)
committer GitHub <noreply@github.com>
Sat, 16 Dec 2017 04:29:15 +0000 (12:29 +0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 16 Dec 2017 04:29:15 +0000 (12:29 +0800)
committer	GitHub <noreply@github.com>
	Sat, 16 Dec 2017 04:29:15 +0000 (12:29 +0800)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history