Merge pull request #16757 from rzarzynski/wip-rgw-20883

author Casey Bodley <cbodley@users.noreply.github.com>

Fri, 16 Feb 2018 16:59:12 +0000 (11:59 -0500)

committer GitHub <noreply@github.com>

Fri, 16 Feb 2018 16:59:12 +0000 (11:59 -0500)
author Casey Bodley <cbodley@users.noreply.github.com>
Fri, 16 Feb 2018 16:59:12 +0000 (11:59 -0500)
committer GitHub <noreply@github.com>
Fri, 16 Feb 2018 16:59:12 +0000 (11:59 -0500)
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Fri, 16 Feb 2018 16:59:12 +0000 (11:59 -0500)
committer	GitHub <noreply@github.com>
	Fri, 16 Feb 2018 16:59:12 +0000 (11:59 -0500)
		1	2
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history