Merge pull request #19918 from fangyuxiangGL/lc-omap

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

Thu, 18 Jan 2018 17:59:17 +0000 (09:59 -0800)

committer GitHub <noreply@github.com>

Thu, 18 Jan 2018 17:59:17 +0000 (09:59 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 18 Jan 2018 17:59:17 +0000 (09:59 -0800)
committer GitHub <noreply@github.com>
Thu, 18 Jan 2018 17:59:17 +0000 (09:59 -0800)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 18 Jan 2018 17:59:17 +0000 (09:59 -0800)
committer	GitHub <noreply@github.com>
	Thu, 18 Jan 2018 17:59:17 +0000 (09:59 -0800)
		1	2
src/rgw/rgw_op.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