Merge pull request #36549 from markhpc/wip-bl-dynamic_alen

author Kefu Chai <kchai@redhat.com>

Wed, 17 Mar 2021 14:43:07 +0000 (22:43 +0800)

committer GitHub <noreply@github.com>

Wed, 17 Mar 2021 14:43:07 +0000 (22:43 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 17 Mar 2021 14:43:07 +0000 (22:43 +0800)
committer GitHub <noreply@github.com>
Wed, 17 Mar 2021 14:43:07 +0000 (22:43 +0800)
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/test/bufferlist.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 17 Mar 2021 14:43:07 +0000 (22:43 +0800)
committer	GitHub <noreply@github.com>
	Wed, 17 Mar 2021 14:43:07 +0000 (22:43 +0800)
		1	2
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/bufferlist.cc	patch \|	diff1 \|	diff2 \|	blob \| history