Merge pull request #14219 from ShiqiCooperation/master

author Sage Weil <sage@newdream.net>

Thu, 30 Mar 2017 22:23:09 +0000 (17:23 -0500)

committer GitHub <noreply@github.com>

Thu, 30 Mar 2017 22:23:09 +0000 (17:23 -0500)
author Sage Weil <sage@newdream.net>
Thu, 30 Mar 2017 22:23:09 +0000 (17:23 -0500)
committer GitHub <noreply@github.com>
Thu, 30 Mar 2017 22:23:09 +0000 (17:23 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 30 Mar 2017 22:23:09 +0000 (17:23 -0500)
committer	GitHub <noreply@github.com>
	Thu, 30 Mar 2017 22:23:09 +0000 (17:23 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history