Merge pull request #36482 from cbodley/wip-rgw-bucket-sync-checkpoint

author Casey Bodley <cbodley@users.noreply.github.com>

Fri, 25 Sep 2020 14:42:29 +0000 (10:42 -0400)

committer GitHub <noreply@github.com>

Fri, 25 Sep 2020 14:42:29 +0000 (10:42 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Fri, 25 Sep 2020 14:42:29 +0000 (10:42 -0400)
committer GitHub <noreply@github.com>
Fri, 25 Sep 2020 14:42:29 +0000 (10:42 -0400)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Fri, 25 Sep 2020 14:42:29 +0000 (10:42 -0400)
committer	GitHub <noreply@github.com>
	Fri, 25 Sep 2020 14:42:29 +0000 (10:42 -0400)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/radosgw-admin/help.t	patch \|	diff1 \|	diff2 \|	blob \| history