Merge pull request #42054 from tchaikov/wip-os-xattrs

author Kefu Chai <kchai@redhat.com>

Wed, 30 Jun 2021 11:29:17 +0000 (19:29 +0800)

committer GitHub <noreply@github.com>

Wed, 30 Jun 2021 11:29:17 +0000 (19:29 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 30 Jun 2021 11:29:17 +0000 (19:29 +0800)
committer GitHub <noreply@github.com>
Wed, 30 Jun 2021 11:29:17 +0000 (19:29 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 30 Jun 2021 11:29:17 +0000 (19:29 +0800)
committer	GitHub <noreply@github.com>
	Wed, 30 Jun 2021 11:29:17 +0000 (19:29 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history