]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7269 from liewegas/wip-bluestore-btree
authorSage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)
committerSage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)
bluestore: use btree_map for allocator

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/os/bluestore/StupidAllocator.cc
src/test/CMakeLists.txt

index e129d78b80f1dc99028624904f48b5763bd73457,4c4f395034f057031ef356f59b9453a2040248ea..a8f70a3ec7e050db512ec8fa6b5b814ffa7283ea
mode 100755,100644..100755
Simple merge