Merge pull request #19878 from cbodley/wip-rgw-get-omap-keys-cr

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

Tue, 16 Jan 2018 17:05:28 +0000 (09:05 -0800)

committer GitHub <noreply@github.com>

Tue, 16 Jan 2018 17:05:28 +0000 (09:05 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 16 Jan 2018 17:05:28 +0000 (09:05 -0800)
committer GitHub <noreply@github.com>
Tue, 16 Jan 2018 17:05:28 +0000 (09:05 -0800)
diff --cc src/rgw/rgw_cr_rados.cc
Simple merge
diff --cc src/rgw/rgw_cr_rados.h
Simple merge
diff --cc src/rgw/rgw_data_sync.cc
Simple merge
diff --cc src/rgw/rgw_sync.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 16 Jan 2018 17:05:28 +0000 (09:05 -0800)
committer	GitHub <noreply@github.com>
	Tue, 16 Jan 2018 17:05:28 +0000 (09:05 -0800)
		1	2
src/rgw/rgw_cr_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_cr_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_data_sync.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sync.cc	patch \|	diff1 \|	diff2 \|	blob \| history