Merge pull request #19366 from liewegas/wip-21557

author Kefu Chai <tchaikov@gmail.com>

Wed, 13 Dec 2017 12:02:10 +0000 (20:02 +0800)

committer GitHub <noreply@github.com>

Wed, 13 Dec 2017 12:02:10 +0000 (20:02 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 13 Dec 2017 12:02:10 +0000 (20:02 +0800)
committer GitHub <noreply@github.com>
Wed, 13 Dec 2017 12:02:10 +0000 (20:02 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 13 Dec 2017 12:02:10 +0000 (20:02 +0800)
committer	GitHub <noreply@github.com>
	Wed, 13 Dec 2017 12:02:10 +0000 (20:02 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history