Merge pull request #11243 from liewegas/wip-bluestore-deferred-csum

author Sage Weil <sage@redhat.com>

Wed, 28 Sep 2016 15:40:43 +0000 (10:40 -0500)

committer GitHub <noreply@github.com>

Wed, 28 Sep 2016 15:40:43 +0000 (10:40 -0500)
author Sage Weil <sage@redhat.com>
Wed, 28 Sep 2016 15:40:43 +0000 (10:40 -0500)
committer GitHub <noreply@github.com>
Wed, 28 Sep 2016 15:40:43 +0000 (10:40 -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>
	Wed, 28 Sep 2016 15:40:43 +0000 (10:40 -0500)
committer	GitHub <noreply@github.com>
	Wed, 28 Sep 2016 15:40:43 +0000 (10:40 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history