Merge pull request #33434 from ifed01/wip-ifed-big-writes-deferred

author Kefu Chai <kchai@redhat.com>

Mon, 13 Apr 2020 16:25:24 +0000 (00:25 +0800)

committer GitHub <noreply@github.com>

Mon, 13 Apr 2020 16:25:24 +0000 (00:25 +0800)
author Kefu Chai <kchai@redhat.com>
Mon, 13 Apr 2020 16:25:24 +0000 (00:25 +0800)
committer GitHub <noreply@github.com>
Mon, 13 Apr 2020 16:25:24 +0000 (00:25 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Mon, 13 Apr 2020 16:25:24 +0000 (00:25 +0800)
committer	GitHub <noreply@github.com>
	Mon, 13 Apr 2020 16:25:24 +0000 (00:25 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history