Merge pull request #8482 from majianpeng/bluestore-prefallocate

author Sage Weil <sage@redhat.com>

Wed, 11 May 2016 14:52:42 +0000 (10:52 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 11 May 2016 14:52:42 +0000 (10:52 -0400)
author Sage Weil <sage@redhat.com>
Wed, 11 May 2016 14:52:42 +0000 (10:52 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 11 May 2016 14:52:42 +0000 (10:52 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 11 May 2016 14:52:42 +0000 (10:52 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 11 May 2016 14:52:42 +0000 (10:52 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history