Merge pull request #35416 from yanghonggang/master

author Kefu Chai <kchai@redhat.com>

Wed, 24 Jun 2020 03:09:49 +0000 (11:09 +0800)

committer GitHub <noreply@github.com>

Wed, 24 Jun 2020 03:09:49 +0000 (11:09 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 24 Jun 2020 03:09:49 +0000 (11:09 +0800)
committer GitHub <noreply@github.com>
Wed, 24 Jun 2020 03:09:49 +0000 (11:09 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 24 Jun 2020 03:09:49 +0000 (11:09 +0800)
committer	GitHub <noreply@github.com>
	Wed, 24 Jun 2020 03:09:49 +0000 (11:09 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history