Merge pull request #7269 from liewegas/wip-bluestore-btree

author Sage Weil <sage@redhat.com>

Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)
author Sage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)
diff --cc src/os/bluestore/StupidAllocator.cc

index e129d78b80f1dc99028624904f48b5763bd73457,4c4f395034f057031ef356f59b9453a2040248ea..a8f70a3ec7e050db512ec8fa6b5b814ffa7283ea

mode 100755,100644..100755
--- 1/src/os/bluestore/StupidAllocator.cc
--- 2/src/os/bluestore/StupidAllocator.cc
+++ b/src/os/bluestore/StupidAllocator.cc
diff --cc src/test/CMakeLists.txt
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)
		1	2
src/os/bluestore/StupidAllocator.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history