Merge pull request #15834 from prallabh/wip-20377

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

Wed, 12 Jul 2017 15:52:24 +0000 (08:52 -0700)

committer GitHub <noreply@github.com>

Wed, 12 Jul 2017 15:52:24 +0000 (08:52 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Wed, 12 Jul 2017 15:52:24 +0000 (08:52 -0700)
committer GitHub <noreply@github.com>
Wed, 12 Jul 2017 15:52:24 +0000 (08:52 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Wed, 12 Jul 2017 15:52:24 +0000 (08:52 -0700)
committer	GitHub <noreply@github.com>
	Wed, 12 Jul 2017 15:52:24 +0000 (08:52 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history