Merge pull request #37537 from yuvalif/missing_brackets_in_rgw_file

author Yuval Lifshitz <yuvalif@yahoo.com>

Tue, 13 Oct 2020 05:06:31 +0000 (08:06 +0300)

committer GitHub <noreply@github.com>

Tue, 13 Oct 2020 05:06:31 +0000 (08:06 +0300)
author Yuval Lifshitz <yuvalif@yahoo.com>
Tue, 13 Oct 2020 05:06:31 +0000 (08:06 +0300)
committer GitHub <noreply@github.com>
Tue, 13 Oct 2020 05:06:31 +0000 (08:06 +0300)
diff --cc src/rgw/rgw_file.cc
Simple merge
diff --cc src/rgw/rgw_file.h
Simple merge
author	Yuval Lifshitz <yuvalif@yahoo.com>
	Tue, 13 Oct 2020 05:06:31 +0000 (08:06 +0300)
committer	GitHub <noreply@github.com>
	Tue, 13 Oct 2020 05:06:31 +0000 (08:06 +0300)
		1	2
src/rgw/rgw_file.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.h	patch \|	diff1 \|	diff2 \|	blob \| history