Merge pull request #32437 from pritha-srivastava/wip-42385-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 29 Jan 2020 20:30:14 +0000 (12:30 -0800)

committer GitHub <noreply@github.com>

Wed, 29 Jan 2020 20:30:14 +0000 (12:30 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 29 Jan 2020 20:30:14 +0000 (12:30 -0800)
committer GitHub <noreply@github.com>
Wed, 29 Jan 2020 20:30:14 +0000 (12:30 -0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 29 Jan 2020 20:30:14 +0000 (12:30 -0800)
committer	GitHub <noreply@github.com>
	Wed, 29 Jan 2020 20:30:14 +0000 (12:30 -0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history