Merge pull request #17281 from smithfarm/wip-20818-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Tue, 12 Sep 2017 20:09:25 +0000 (22:09 +0200)

committer GitHub <noreply@github.com>

Tue, 12 Sep 2017 20:09:25 +0000 (22:09 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Tue, 12 Sep 2017 20:09:25 +0000 (22:09 +0200)
committer GitHub <noreply@github.com>
Tue, 12 Sep 2017 20:09:25 +0000 (22:09 +0200)
diff --cc src/rgw/rgw_quota.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Tue, 12 Sep 2017 20:09:25 +0000 (22:09 +0200)
committer	GitHub <noreply@github.com>
	Tue, 12 Sep 2017 20:09:25 +0000 (22:09 +0200)
		1	2
src/rgw/rgw_quota.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history