Merge pull request #11482 from ifed01/wip-bluestore-gc-fixes2

author Sage Weil <sage@redhat.com>

Fri, 14 Oct 2016 14:13:28 +0000 (09:13 -0500)

committer GitHub <noreply@github.com>

Fri, 14 Oct 2016 14:13:28 +0000 (09:13 -0500)
author Sage Weil <sage@redhat.com>
Fri, 14 Oct 2016 14:13:28 +0000 (09:13 -0500)
committer GitHub <noreply@github.com>
Fri, 14 Oct 2016 14:13:28 +0000 (09:13 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 14 Oct 2016 14:13:28 +0000 (09:13 -0500)
committer	GitHub <noreply@github.com>
	Fri, 14 Oct 2016 14:13:28 +0000 (09:13 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history