Merge pull request #41031 from trociny/wip-48424-octopus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 9 Jun 2021 16:24:25 +0000 (09:24 -0700)

committer GitHub <noreply@github.com>

Wed, 9 Jun 2021 16:24:25 +0000 (09:24 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 9 Jun 2021 16:24:25 +0000 (09:24 -0700)
committer GitHub <noreply@github.com>
Wed, 9 Jun 2021 16:24:25 +0000 (09:24 -0700)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 9 Jun 2021 16:24:25 +0000 (09:24 -0700)
committer	GitHub <noreply@github.com>
	Wed, 9 Jun 2021 16:24:25 +0000 (09:24 -0700)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history