Merge pull request #11050 from xiexingguo/xxg-wip-os-0912

author Yuri Weinstein <yuri.weinstein@gmail.com>

Sat, 17 Sep 2016 15:45:45 +0000 (08:45 -0700)

committer GitHub <noreply@github.com>

Sat, 17 Sep 2016 15:45:45 +0000 (08:45 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Sat, 17 Sep 2016 15:45:45 +0000 (08:45 -0700)
committer GitHub <noreply@github.com>
Sat, 17 Sep 2016 15:45:45 +0000 (08:45 -0700)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Sat, 17 Sep 2016 15:45:45 +0000 (08:45 -0700)
committer	GitHub <noreply@github.com>
	Sat, 17 Sep 2016 15:45:45 +0000 (08:45 -0700)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history