Merge pull request #19131 from theanalyst/usage-trim

author Yuri Weinstein <yuri.weinstein@gmail.com>

Mon, 18 Dec 2017 16:47:23 +0000 (08:47 -0800)

committer GitHub <noreply@github.com>

Mon, 18 Dec 2017 16:47:23 +0000 (08:47 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Mon, 18 Dec 2017 16:47:23 +0000 (08:47 -0800)
committer GitHub <noreply@github.com>
Mon, 18 Dec 2017 16:47:23 +0000 (08:47 -0800)
diff --cc src/cls/rgw/cls_rgw.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/test/cls_rgw/test_cls_rgw.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Mon, 18 Dec 2017 16:47:23 +0000 (08:47 -0800)
committer	GitHub <noreply@github.com>
	Mon, 18 Dec 2017 16:47:23 +0000 (08:47 -0800)
		1	2
src/cls/rgw/cls_rgw.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cls_rgw/test_cls_rgw.cc	patch \|	diff1 \|	diff2 \|	blob \| history