Merge remote-tracking branch 'ceph_main/main' into update-ceph-mgw

author Dattaprasad Govekar <dattaprasad.govekar@seagate.com>

Thu, 23 Jun 2022 05:01:46 +0000 (23:01 -0600)

committer Dattaprasad Govekar <dattaprasad.govekar@seagate.com>

Thu, 23 Jun 2022 05:01:46 +0000 (23:01 -0600)
author Dattaprasad Govekar <dattaprasad.govekar@seagate.com>
Thu, 23 Jun 2022 05:01:46 +0000 (23:01 -0600)
committer Dattaprasad Govekar <dattaprasad.govekar@seagate.com>
Thu, 23 Jun 2022 05:01:46 +0000 (23:01 -0600)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_sal_motr.cc
Simple merge
diff --cc src/rgw/rgw_sal_motr.h
Simple merge
author	Dattaprasad Govekar <dattaprasad.govekar@seagate.com>
	Thu, 23 Jun 2022 05:01:46 +0000 (23:01 -0600)
committer	Dattaprasad Govekar <dattaprasad.govekar@seagate.com>
	Thu, 23 Jun 2022 05:01:46 +0000 (23:01 -0600)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sal_motr.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sal_motr.h	patch \|	diff1 \|	diff2 \|	blob \| history