Merge pull request #11905 from xiexingguo/xxg-wip-kill-boost-warn

author Sage Weil <sage@redhat.com>

Fri, 11 Nov 2016 15:30:54 +0000 (09:30 -0600)

committer GitHub <noreply@github.com>

Fri, 11 Nov 2016 15:30:54 +0000 (09:30 -0600)
author Sage Weil <sage@redhat.com>
Fri, 11 Nov 2016 15:30:54 +0000 (09:30 -0600)
committer GitHub <noreply@github.com>
Fri, 11 Nov 2016 15:30:54 +0000 (09:30 -0600)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 11 Nov 2016 15:30:54 +0000 (09:30 -0600)
committer	GitHub <noreply@github.com>
	Fri, 11 Nov 2016 15:30:54 +0000 (09:30 -0600)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history