Merge pull request #19819 from adamemerson/wip-backport-22601

author Yuri Weinstein <yuri.weinstein@gmail.com>

Fri, 19 Jan 2018 21:01:10 +0000 (13:01 -0800)

committer GitHub <noreply@github.com>

Fri, 19 Jan 2018 21:01:10 +0000 (13:01 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Fri, 19 Jan 2018 21:01:10 +0000 (13:01 -0800)
committer GitHub <noreply@github.com>
Fri, 19 Jan 2018 21:01:10 +0000 (13:01 -0800)
diff --cc src/rgw/rgw_iam_policy.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Fri, 19 Jan 2018 21:01:10 +0000 (13:01 -0800)
committer	GitHub <noreply@github.com>
	Fri, 19 Jan 2018 21:01:10 +0000 (13:01 -0800)
		1	2
src/rgw/rgw_iam_policy.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history