From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Jan 2016 18:21:26 +0000 (-0500)
Subject: Merge pull request #7269 from liewegas/wip-bluestore-btree
X-Git-Tag: v10.0.4~156
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c30be93e3794aa7753810151ecd17431cc59d00;p=ceph.git

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

bluestore: use btree_map for allocator

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

9c30be93e3794aa7753810151ecd17431cc59d00
diff --cc src/os/bluestore/StupidAllocator.cc
index e129d78b80f1,4c4f395034f0..a8f70a3ec7e0
mode 100755,100644..100755
--- a/src/os/bluestore/StupidAllocator.cc
+++ b/src/os/bluestore/StupidAllocator.cc