Merge pull request #11890 from liupan1111/wip-code-clean-ups

author Kefu Chai <tchaikov@gmail.com>

Thu, 17 Nov 2016 06:54:49 +0000 (14:54 +0800)

committer GitHub <noreply@github.com>

Thu, 17 Nov 2016 06:54:49 +0000 (14:54 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 17 Nov 2016 06:54:49 +0000 (14:54 +0800)
committer GitHub <noreply@github.com>
Thu, 17 Nov 2016 06:54:49 +0000 (14:54 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/KernelDevice.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 17 Nov 2016 06:54:49 +0000 (14:54 +0800)
committer	GitHub <noreply@github.com>
	Thu, 17 Nov 2016 06:54:49 +0000 (14:54 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/KernelDevice.cc	patch \|	diff1 \|	diff2 \|	blob \| history