Merge pull request #9604 from ifed01/wip-bluestore-maxalloc

author Sage Weil <sage@redhat.com>

Wed, 15 Jun 2016 19:05:51 +0000 (15:05 -0400)

committer GitHub <noreply@github.com>

Wed, 15 Jun 2016 19:05:51 +0000 (15:05 -0400)
author Sage Weil <sage@redhat.com>
Wed, 15 Jun 2016 19:05:51 +0000 (15:05 -0400)
committer GitHub <noreply@github.com>
Wed, 15 Jun 2016 19:05:51 +0000 (15:05 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 15 Jun 2016 19:05:51 +0000 (15:05 -0400)
committer	GitHub <noreply@github.com>
	Wed, 15 Jun 2016 19:05:51 +0000 (15:05 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history