Merge pull request #29139 from ivancich/mimic-fix-resharding-race

author Yuri Weinstein <yweinste@redhat.com>

Wed, 24 Jul 2019 15:25:38 +0000 (08:25 -0700)

committer GitHub <noreply@github.com>

Wed, 24 Jul 2019 15:25:38 +0000 (08:25 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 24 Jul 2019 15:25:38 +0000 (08:25 -0700)
committer GitHub <noreply@github.com>
Wed, 24 Jul 2019 15:25:38 +0000 (08:25 -0700)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 24 Jul 2019 15:25:38 +0000 (08:25 -0700)
committer	GitHub <noreply@github.com>
	Wed, 24 Jul 2019 15:25:38 +0000 (08:25 -0700)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history