Merge remote-tracking branch 'origin/pacific-saved' into pacific

author Sage Weil <sage@newdream.net>

Fri, 14 May 2021 14:17:59 +0000 (09:17 -0500)

committer Sage Weil <sage@newdream.net>

Fri, 14 May 2021 14:17:59 +0000 (09:17 -0500)
author Sage Weil <sage@newdream.net>
Fri, 14 May 2021 14:17:59 +0000 (09:17 -0500)
committer Sage Weil <sage@newdream.net>
Fri, 14 May 2021 14:17:59 +0000 (09:17 -0500)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 14 May 2021 14:17:59 +0000 (09:17 -0500)
committer	Sage Weil <sage@newdream.net>
	Fri, 14 May 2021 14:17:59 +0000 (09:17 -0500)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history