Merge pull request #34086 from ivancich/wip-deprecate-orphans-find

author J. Eric Ivancich <ivancich@redhat.com>

Tue, 5 May 2020 19:51:21 +0000 (15:51 -0400)

committer GitHub <noreply@github.com>

Tue, 5 May 2020 19:51:21 +0000 (15:51 -0400)
author J. Eric Ivancich <ivancich@redhat.com>
Tue, 5 May 2020 19:51:21 +0000 (15:51 -0400)
committer GitHub <noreply@github.com>
Tue, 5 May 2020 19:51:21 +0000 (15:51 -0400)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	J. Eric Ivancich <ivancich@redhat.com>
	Tue, 5 May 2020 19:51:21 +0000 (15:51 -0400)
committer	GitHub <noreply@github.com>
	Tue, 5 May 2020 19:51:21 +0000 (15:51 -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