Merge pull request #42922 from dang/wip-dang-zipper-cleanup

author Daniel Gryniewicz <dang@redhat.com>

Thu, 26 Aug 2021 13:45:17 +0000 (09:45 -0400)

committer GitHub <noreply@github.com>

Thu, 26 Aug 2021 13:45:17 +0000 (09:45 -0400)
author Daniel Gryniewicz <dang@redhat.com>
Thu, 26 Aug 2021 13:45:17 +0000 (09:45 -0400)
committer GitHub <noreply@github.com>
Thu, 26 Aug 2021 13:45:17 +0000 (09:45 -0400)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Daniel Gryniewicz <dang@redhat.com>
	Thu, 26 Aug 2021 13:45:17 +0000 (09:45 -0400)
committer	GitHub <noreply@github.com>
	Thu, 26 Aug 2021 13:45:17 +0000 (09:45 -0400)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history