Merge pull request #20236 from linuxbox2/luminous-rgw-22121

author Abhishek L <abhishek.lekshmanan@gmail.com>

Fri, 23 Feb 2018 17:00:28 +0000 (18:00 +0100)

committer GitHub <noreply@github.com>

Fri, 23 Feb 2018 17:00:28 +0000 (18:00 +0100)
author Abhishek L <abhishek.lekshmanan@gmail.com>
Fri, 23 Feb 2018 17:00:28 +0000 (18:00 +0100)
committer GitHub <noreply@github.com>
Fri, 23 Feb 2018 17:00:28 +0000 (18:00 +0100)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Abhishek L <abhishek.lekshmanan@gmail.com>
	Fri, 23 Feb 2018 17:00:28 +0000 (18:00 +0100)
committer	GitHub <noreply@github.com>
	Fri, 23 Feb 2018 17:00:28 +0000 (18:00 +0100)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history