Merge pull request #16181 from smithfarm/wip-20363-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 19 Jul 2017 13:31:50 +0000 (15:31 +0200)

committer GitHub <noreply@github.com>

Wed, 19 Jul 2017 13:31:50 +0000 (15:31 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 19 Jul 2017 13:31:50 +0000 (15:31 +0200)
committer GitHub <noreply@github.com>
Wed, 19 Jul 2017 13:31:50 +0000 (15:31 +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>
	Wed, 19 Jul 2017 13:31:50 +0000 (15:31 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 Jul 2017 13:31:50 +0000 (15:31 +0200)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history