Merge pull request #30231 from xiexingguo/wip-blue-balance

author Xie Xingguo <xie.xingguo@zte.com.cn>

Wed, 11 Sep 2019 06:27:44 +0000 (14:27 +0800)

committer GitHub <noreply@github.com>

Wed, 11 Sep 2019 06:27:44 +0000 (14:27 +0800)
author Xie Xingguo <xie.xingguo@zte.com.cn>
Wed, 11 Sep 2019 06:27:44 +0000 (14:27 +0800)
committer GitHub <noreply@github.com>
Wed, 11 Sep 2019 06:27:44 +0000 (14:27 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Xie Xingguo <xie.xingguo@zte.com.cn>
	Wed, 11 Sep 2019 06:27:44 +0000 (14:27 +0800)
committer	GitHub <noreply@github.com>
	Wed, 11 Sep 2019 06:27:44 +0000 (14:27 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history