Merge pull request #11533 from ifed01/wip-kstore-rmcoll-fix

author Sage Weil <sage@redhat.com>

Tue, 18 Oct 2016 18:22:11 +0000 (13:22 -0500)

committer GitHub <noreply@github.com>

Tue, 18 Oct 2016 18:22:11 +0000 (13:22 -0500)
author Sage Weil <sage@redhat.com>
Tue, 18 Oct 2016 18:22:11 +0000 (13:22 -0500)
committer GitHub <noreply@github.com>
Tue, 18 Oct 2016 18:22:11 +0000 (13:22 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/kstore/KStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 18 Oct 2016 18:22:11 +0000 (13:22 -0500)
committer	GitHub <noreply@github.com>
	Tue, 18 Oct 2016 18:22:11 +0000 (13:22 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/kstore/KStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history