From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Jun 2018 18:00:59 +0000 (-0500)
Subject: Merge PR #22578 into master
X-Git-Tag: v14.0.1~1041
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2a699cb737a4b4d9110db69e895d8e1f772117a;p=ceph.git

Merge PR #22578 into master

* refs/pull/22578/head:
	os/bluestore: provide a rough estimate for bitmap allocator

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
---

b2a699cb737a4b4d9110db69e895d8e1f772117a
diff --cc .githubmap
index dde52d57bc84,6de4c30adccd..63104c954437
--- a/.githubmap
+++ b/.githubmap
@@@ -60,5 -60,4 +60,6 @@@ jan--f Jan Fajerski <jfajerski@suse.com
  idryomov Ilya Dryomov <idryomov@redhat.com>
  varadakari Varada Kari <varadaraja.kari@flipkart.com>
  ErwanAliasr1 Erwan Velu <erwan@redhat.com>
 +alfredodeza Alfredo Deza <adeza@redhat.com>
 +dmick Dan Mick <dmick@redhat.com>
+ aclamk Adam Kupczyk <akucpzyk@redhat.com>