Merge pull request #19921 from fangyuxiangGL/lc-ret

author Yuri Weinstein <yweinste@redhat.com>

Thu, 15 Feb 2018 17:07:57 +0000 (09:07 -0800)

committer GitHub <noreply@github.com>

Thu, 15 Feb 2018 17:07:57 +0000 (09:07 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 15 Feb 2018 17:07:57 +0000 (09:07 -0800)
committer GitHub <noreply@github.com>
Thu, 15 Feb 2018 17:07:57 +0000 (09:07 -0800)
diff --cc src/rgw/rgw_lc.cc
Simple merge
diff --cc src/rgw/rgw_multi.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 15 Feb 2018 17:07:57 +0000 (09:07 -0800)
committer	GitHub <noreply@github.com>
	Thu, 15 Feb 2018 17:07:57 +0000 (09:07 -0800)
		1	2
src/rgw/rgw_lc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_multi.cc	patch \|	diff1 \|	diff2 \|	blob \| history