Merge pull request #28230 from ivancich/nautilus-wip-rgw-admin-unordered

author Yuri Weinstein <yweinste@redhat.com>

Mon, 22 Jul 2019 20:02:41 +0000 (13:02 -0700)

committer GitHub <noreply@github.com>

Mon, 22 Jul 2019 20:02:41 +0000 (13:02 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 22 Jul 2019 20:02:41 +0000 (13:02 -0700)
committer GitHub <noreply@github.com>
Mon, 22 Jul 2019 20:02:41 +0000 (13:02 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 22 Jul 2019 20:02:41 +0000 (13:02 -0700)
committer	GitHub <noreply@github.com>
	Mon, 22 Jul 2019 20:02:41 +0000 (13:02 -0700)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/radosgw-admin/help.t	patch \|	diff1 \|	diff2 \|	blob \| history