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

author Daniel Gryniewicz <dang@redhat.com>

Mon, 15 Aug 2022 16:35:01 +0000 (12:35 -0400)

committer GitHub <noreply@github.com>

Mon, 15 Aug 2022 16:35:01 +0000 (12:35 -0400)
author Daniel Gryniewicz <dang@redhat.com>
Mon, 15 Aug 2022 16:35:01 +0000 (12:35 -0400)
committer GitHub <noreply@github.com>
Mon, 15 Aug 2022 16:35:01 +0000 (12:35 -0400)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_main.cc
Simple merge
diff --cc src/rgw/rgw_sal.h
Simple merge
author	Daniel Gryniewicz <dang@redhat.com>
	Mon, 15 Aug 2022 16:35:01 +0000 (12:35 -0400)
committer	GitHub <noreply@github.com>
	Mon, 15 Aug 2022 16:35:01 +0000 (12:35 -0400)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sal.h	patch \|	diff1 \|	diff2 \|	blob \| history