Merge pull request #39678 from yehudasa/wip-rgw-aws4-client

author Casey Bodley <cbodley@users.noreply.github.com>

Wed, 17 Mar 2021 15:42:08 +0000 (11:42 -0400)

committer GitHub <noreply@github.com>

Wed, 17 Mar 2021 15:42:08 +0000 (11:42 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Wed, 17 Mar 2021 15:42:08 +0000 (11:42 -0400)
committer GitHub <noreply@github.com>
Wed, 17 Mar 2021 15:42:08 +0000 (11:42 -0400)
diff --cc src/common/options.cc
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_http_client.cc
Simple merge
diff --cc src/rgw/rgw_http_client.h
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Wed, 17 Mar 2021 15:42:08 +0000 (11:42 -0400)
committer	GitHub <noreply@github.com>
	Wed, 17 Mar 2021 15:42:08 +0000 (11:42 -0400)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_http_client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_http_client.h	patch \|	diff1 \|	diff2 \|	blob \| history