Merge pull request #25498 from cbodley/wip-27217

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

Mon, 3 Jun 2019 13:00:13 +0000 (09:00 -0400)

committer GitHub <noreply@github.com>

Mon, 3 Jun 2019 13:00:13 +0000 (09:00 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Mon, 3 Jun 2019 13:00:13 +0000 (09:00 -0400)
committer GitHub <noreply@github.com>
Mon, 3 Jun 2019 13:00:13 +0000 (09:00 -0400)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Mon, 3 Jun 2019 13:00:13 +0000 (09:00 -0400)
committer	GitHub <noreply@github.com>
	Mon, 3 Jun 2019 13:00:13 +0000 (09:00 -0400)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history