Merge pull request #35431 from smithfarm/wip-45645-octopus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 10 Jun 2020 15:40:05 +0000 (08:40 -0700)

committer GitHub <noreply@github.com>

Wed, 10 Jun 2020 15:40:05 +0000 (08:40 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 10 Jun 2020 15:40:05 +0000 (08:40 -0700)
committer GitHub <noreply@github.com>
Wed, 10 Jun 2020 15:40:05 +0000 (08:40 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 10 Jun 2020 15:40:05 +0000 (08:40 -0700)
committer	GitHub <noreply@github.com>
	Wed, 10 Jun 2020 15:40:05 +0000 (08:40 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history