Merge pull request #15453 from smithfarm/wip-19768-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Fri, 25 Aug 2017 18:09:15 +0000 (20:09 +0200)

committer GitHub <noreply@github.com>

Fri, 25 Aug 2017 18:09:15 +0000 (20:09 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Fri, 25 Aug 2017 18:09:15 +0000 (20:09 +0200)
committer GitHub <noreply@github.com>
Fri, 25 Aug 2017 18:09:15 +0000 (20:09 +0200)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Fri, 25 Aug 2017 18:09:15 +0000 (20:09 +0200)
committer	GitHub <noreply@github.com>
	Fri, 25 Aug 2017 18:09:15 +0000 (20:09 +0200)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history