Merge pull request #24662 from theanalyst/reshard-stale-cleanup

author Matt Benjamin <mbenjamin@redhat.com>

Wed, 28 Nov 2018 15:22:46 +0000 (10:22 -0500)

committer GitHub <noreply@github.com>

Wed, 28 Nov 2018 15:22:46 +0000 (10:22 -0500)
author Matt Benjamin <mbenjamin@redhat.com>
Wed, 28 Nov 2018 15:22:46 +0000 (10:22 -0500)
committer GitHub <noreply@github.com>
Wed, 28 Nov 2018 15:22:46 +0000 (10:22 -0500)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Wed, 28 Nov 2018 15:22:46 +0000 (10:22 -0500)
committer	GitHub <noreply@github.com>
	Wed, 28 Nov 2018 15:22:46 +0000 (10:22 -0500)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/radosgw-admin/help.t	patch \|	diff1 \|	diff2 \|	blob \| history