Merge pull request #25421 from xiexingguo/wip-37507

author Yuri Weinstein <yweinste@redhat.com>

Mon, 17 Dec 2018 14:44:20 +0000 (06:44 -0800)

committer GitHub <noreply@github.com>

Mon, 17 Dec 2018 14:44:20 +0000 (06:44 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 17 Dec 2018 14:44:20 +0000 (06:44 -0800)
committer GitHub <noreply@github.com>
Mon, 17 Dec 2018 14:44:20 +0000 (06:44 -0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 17 Dec 2018 14:44:20 +0000 (06:44 -0800)
committer	GitHub <noreply@github.com>
	Mon, 17 Dec 2018 14:44:20 +0000 (06:44 -0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history