Merge pull request #25999 from cbodley/wip-37945

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

Fri, 22 Mar 2019 20:23:39 +0000 (16:23 -0400)

committer GitHub <noreply@github.com>

Fri, 22 Mar 2019 20:23:39 +0000 (16:23 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Fri, 22 Mar 2019 20:23:39 +0000 (16:23 -0400)
committer GitHub <noreply@github.com>
Fri, 22 Mar 2019 20:23:39 +0000 (16:23 -0400)
diff --cc src/rgw/rgw_common.cc
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Fri, 22 Mar 2019 20:23:39 +0000 (16:23 -0400)
committer	GitHub <noreply@github.com>
	Fri, 22 Mar 2019 20:23:39 +0000 (16:23 -0400)
		1	2
src/rgw/rgw_common.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history