Merge pull request #26233 from liewegas/wip-bluestore-disable-csum

author Kefu Chai <tchaikov@gmail.com>

Sun, 3 Feb 2019 17:24:08 +0000 (01:24 +0800)

committer GitHub <noreply@github.com>

Sun, 3 Feb 2019 17:24:08 +0000 (01:24 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 3 Feb 2019 17:24:08 +0000 (01:24 +0800)
committer GitHub <noreply@github.com>
Sun, 3 Feb 2019 17:24:08 +0000 (01:24 +0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 3 Feb 2019 17:24:08 +0000 (01:24 +0800)
committer	GitHub <noreply@github.com>
	Sun, 3 Feb 2019 17:24:08 +0000 (01:24 +0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history