Merge pull request #13651 from rzarzynski/wip-bs-bitmap-nocct-in-entry

author Sage Weil <sage@newdream.net>

Wed, 1 Mar 2017 22:29:09 +0000 (16:29 -0600)

committer GitHub <noreply@github.com>

Wed, 1 Mar 2017 22:29:09 +0000 (16:29 -0600)
author Sage Weil <sage@newdream.net>
Wed, 1 Mar 2017 22:29:09 +0000 (16:29 -0600)
committer GitHub <noreply@github.com>
Wed, 1 Mar 2017 22:29:09 +0000 (16:29 -0600)
diff --cc src/os/bluestore/BitAllocator.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 1 Mar 2017 22:29:09 +0000 (16:29 -0600)
committer	GitHub <noreply@github.com>
	Wed, 1 Mar 2017 22:29:09 +0000 (16:29 -0600)