Merge pull request #10040 from xiexingguo/xxg-wip-bit-alloc-tree-configurable

author Sage Weil <sage@redhat.com>

Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)

committer GitHub <noreply@github.com>

Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)
author Sage Weil <sage@redhat.com>
Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)
committer GitHub <noreply@github.com>
Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BitAllocator.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)
committer	GitHub <noreply@github.com>
	Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BitAllocator.h	patch \|	diff1 \|	diff2 \|	blob \| history