Merge pull request #29410 from pdvian/wip-40627-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)

committer GitHub <noreply@github.com>

Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)
committer GitHub <noreply@github.com>
Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)
diff --cc src/rgw/rgw_file.cc
Simple merge
diff --cc src/rgw/rgw_file.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)
committer	GitHub <noreply@github.com>
	Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)
		1	2
src/rgw/rgw_file.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.h	patch \|	diff1 \|	diff2 \|	blob \| history