Merge pull request #29703 from baixueyu/wip-quota

author Ali Maredia <amaredia@redhat.com>

Thu, 23 Jan 2020 18:13:17 +0000 (13:13 -0500)

committer GitHub <noreply@github.com>

Thu, 23 Jan 2020 18:13:17 +0000 (13:13 -0500)
author Ali Maredia <amaredia@redhat.com>
Thu, 23 Jan 2020 18:13:17 +0000 (13:13 -0500)
committer GitHub <noreply@github.com>
Thu, 23 Jan 2020 18:13:17 +0000 (13:13 -0500)
diff --cc src/rgw/rgw_multi.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Ali Maredia <amaredia@redhat.com>
	Thu, 23 Jan 2020 18:13:17 +0000 (13:13 -0500)
committer	GitHub <noreply@github.com>
	Thu, 23 Jan 2020 18:13:17 +0000 (13:13 -0500)
		1	2
src/rgw/rgw_multi.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