Merge pull request #24319 from smithfarm/wip-35979-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 17 Oct 2018 20:11:38 +0000 (16:11 -0400)

committer GitHub <noreply@github.com>

Wed, 17 Oct 2018 20:11:38 +0000 (16:11 -0400)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 17 Oct 2018 20:11:38 +0000 (16:11 -0400)
committer GitHub <noreply@github.com>
Wed, 17 Oct 2018 20:11:38 +0000 (16:11 -0400)
diff --cc src/rgw/rgw_data_sync.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 17 Oct 2018 20:11:38 +0000 (16:11 -0400)
committer	GitHub <noreply@github.com>
	Wed, 17 Oct 2018 20:11:38 +0000 (16:11 -0400)
		1	2
src/rgw/rgw_data_sync.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history