Merge pull request #37548 from ofriedma/wip-ofriedma-quota-hdrs

author Matt Benjamin <mbenjamin@redhat.com>

Thu, 3 Dec 2020 17:13:43 +0000 (12:13 -0500)

committer GitHub <noreply@github.com>

Thu, 3 Dec 2020 17:13:43 +0000 (12:13 -0500)
author Matt Benjamin <mbenjamin@redhat.com>
Thu, 3 Dec 2020 17:13:43 +0000 (12:13 -0500)
committer GitHub <noreply@github.com>
Thu, 3 Dec 2020 17:13:43 +0000 (12:13 -0500)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Thu, 3 Dec 2020 17:13:43 +0000 (12:13 -0500)
committer	GitHub <noreply@github.com>
	Thu, 3 Dec 2020 17:13:43 +0000 (12:13 -0500)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history