Merge pull request #35111 from agayev/hm-smr

author Kefu Chai <kchai@redhat.com>

Wed, 27 May 2020 13:55:50 +0000 (21:55 +0800)

committer GitHub <noreply@github.com>

Wed, 27 May 2020 13:55:50 +0000 (21:55 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 27 May 2020 13:55:50 +0000 (21:55 +0800)
committer GitHub <noreply@github.com>
Wed, 27 May 2020 13:55:50 +0000 (21:55 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 27 May 2020 13:55:50 +0000 (21:55 +0800)
committer	GitHub <noreply@github.com>
	Wed, 27 May 2020 13:55:50 +0000 (21:55 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history