Merge pull request #43909 from ivancich/wip-small-code-fixups

author J. Eric Ivancich <ivancich@redhat.com>

Tue, 16 Nov 2021 19:19:44 +0000 (14:19 -0500)

committer GitHub <noreply@github.com>

Tue, 16 Nov 2021 19:19:44 +0000 (14:19 -0500)
author J. Eric Ivancich <ivancich@redhat.com>
Tue, 16 Nov 2021 19:19:44 +0000 (14:19 -0500)
committer GitHub <noreply@github.com>
Tue, 16 Nov 2021 19:19:44 +0000 (14:19 -0500)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_sal.h
Simple merge
diff --cc src/rgw/rgw_sal_rados.cc
Simple merge
author	J. Eric Ivancich <ivancich@redhat.com>
	Tue, 16 Nov 2021 19:19:44 +0000 (14:19 -0500)
committer	GitHub <noreply@github.com>
	Tue, 16 Nov 2021 19:19:44 +0000 (14:19 -0500)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sal.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sal_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history