Merge pull request #29961 from smithfarm/wip-41130-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 13 Nov 2019 20:24:38 +0000 (12:24 -0800)

committer GitHub <noreply@github.com>

Wed, 13 Nov 2019 20:24:38 +0000 (12:24 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 13 Nov 2019 20:24:38 +0000 (12:24 -0800)
committer GitHub <noreply@github.com>
Wed, 13 Nov 2019 20:24:38 +0000 (12:24 -0800)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 13 Nov 2019 20:24:38 +0000 (12:24 -0800)
committer	GitHub <noreply@github.com>
	Wed, 13 Nov 2019 20:24:38 +0000 (12:24 -0800)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history