Merge pull request #33521 from linuxbox2/wip-getset-ver-nosuch

author J. Eric Ivancich <ivancich@redhat.com>

Mon, 8 Jun 2020 23:50:47 +0000 (19:50 -0400)

committer GitHub <noreply@github.com>

Mon, 8 Jun 2020 23:50:47 +0000 (19:50 -0400)
author J. Eric Ivancich <ivancich@redhat.com>
Mon, 8 Jun 2020 23:50:47 +0000 (19:50 -0400)
committer GitHub <noreply@github.com>
Mon, 8 Jun 2020 23:50:47 +0000 (19:50 -0400)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	J. Eric Ivancich <ivancich@redhat.com>
	Mon, 8 Jun 2020 23:50:47 +0000 (19:50 -0400)
committer	GitHub <noreply@github.com>
	Mon, 8 Jun 2020 23:50:47 +0000 (19:50 -0400)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history