Merge pull request #9840 from xiexingguo/xxg-wip-fix-bmap-fm

author Sage Weil <sage@redhat.com>

Tue, 21 Jun 2016 14:26:06 +0000 (10:26 -0400)

committer GitHub <noreply@github.com>

Tue, 21 Jun 2016 14:26:06 +0000 (10:26 -0400)
author Sage Weil <sage@redhat.com>
Tue, 21 Jun 2016 14:26:06 +0000 (10:26 -0400)
committer GitHub <noreply@github.com>
Tue, 21 Jun 2016 14:26:06 +0000 (10:26 -0400)
diff --cc src/os/bluestore/BitmapFreelistManager.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 21 Jun 2016 14:26:06 +0000 (10:26 -0400)
committer	GitHub <noreply@github.com>
	Tue, 21 Jun 2016 14:26:06 +0000 (10:26 -0400)
		1	2
src/os/bluestore/BitmapFreelistManager.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history