Merge pull request #24899 from ivancich/rgw-renew-reshard-lock-mimic

author Yuri Weinstein <yweinste@redhat.com>

Tue, 20 Nov 2018 17:12:33 +0000 (09:12 -0800)

committer GitHub <noreply@github.com>

Tue, 20 Nov 2018 17:12:33 +0000 (09:12 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 20 Nov 2018 17:12:33 +0000 (09:12 -0800)
committer GitHub <noreply@github.com>
Tue, 20 Nov 2018 17:12:33 +0000 (09:12 -0800)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_cr_rados.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 20 Nov 2018 17:12:33 +0000 (09:12 -0800)
committer	GitHub <noreply@github.com>
	Tue, 20 Nov 2018 17:12:33 +0000 (09:12 -0800)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_cr_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history