Merge pull request #40296 from xijiacun/octopus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 14 May 2021 17:44:28 +0000 (10:44 -0700)

committer GitHub <noreply@github.com>

Fri, 14 May 2021 17:44:28 +0000 (10:44 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 14 May 2021 17:44:28 +0000 (10:44 -0700)
committer GitHub <noreply@github.com>
Fri, 14 May 2021 17:44:28 +0000 (10:44 -0700)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 14 May 2021 17:44:28 +0000 (10:44 -0700)
committer	GitHub <noreply@github.com>
	Fri, 14 May 2021 17:44:28 +0000 (10:44 -0700)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history