Merge pull request #16051 from liewegas/wip-20381

author Kefu Chai <tchaikov@gmail.com>

Wed, 5 Jul 2017 06:59:32 +0000 (14:59 +0800)

committer GitHub <noreply@github.com>

Wed, 5 Jul 2017 06:59:32 +0000 (14:59 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 5 Jul 2017 06:59:32 +0000 (14:59 +0800)
committer GitHub <noreply@github.com>
Wed, 5 Jul 2017 06:59:32 +0000 (14:59 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 5 Jul 2017 06:59:32 +0000 (14:59 +0800)
committer	GitHub <noreply@github.com>
	Wed, 5 Jul 2017 06:59:32 +0000 (14:59 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history