Merge pull request #16316 from smithfarm/wip-20362-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Thu, 7 Sep 2017 14:33:08 +0000 (16:33 +0200)

committer GitHub <noreply@github.com>

Thu, 7 Sep 2017 14:33:08 +0000 (16:33 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Thu, 7 Sep 2017 14:33:08 +0000 (16:33 +0200)
committer GitHub <noreply@github.com>
Thu, 7 Sep 2017 14:33:08 +0000 (16:33 +0200)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Thu, 7 Sep 2017 14:33:08 +0000 (16:33 +0200)
committer	GitHub <noreply@github.com>
	Thu, 7 Sep 2017 14:33:08 +0000 (16:33 +0200)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history