Merge pull request #12719 from xiexingguo/xxg-wip-bluestore-1229

author Sage Weil <sage@redhat.com>

Wed, 18 Jan 2017 13:36:00 +0000 (07:36 -0600)

committer GitHub <noreply@github.com>

Wed, 18 Jan 2017 13:36:00 +0000 (07:36 -0600)
author Sage Weil <sage@redhat.com>
Wed, 18 Jan 2017 13:36:00 +0000 (07:36 -0600)
committer GitHub <noreply@github.com>
Wed, 18 Jan 2017 13:36:00 +0000 (07:36 -0600)
diff --cc src/os/bluestore/BitmapFreelistManager.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 18 Jan 2017 13:36:00 +0000 (07:36 -0600)
committer	GitHub <noreply@github.com>
	Wed, 18 Jan 2017 13:36:00 +0000 (07:36 -0600)