Merge pull request #18302 from joscollin/wip-update-radosgw-admin-usage

author Orit Wasserman <owasserm@redhat.com>

Mon, 20 Nov 2017 10:36:51 +0000 (12:36 +0200)

committer GitHub <noreply@github.com>

Mon, 20 Nov 2017 10:36:51 +0000 (12:36 +0200)
author Orit Wasserman <owasserm@redhat.com>
Mon, 20 Nov 2017 10:36:51 +0000 (12:36 +0200)
committer GitHub <noreply@github.com>
Mon, 20 Nov 2017 10:36:51 +0000 (12:36 +0200)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Orit Wasserman <owasserm@redhat.com>
	Mon, 20 Nov 2017 10:36:51 +0000 (12:36 +0200)
committer	GitHub <noreply@github.com>
	Mon, 20 Nov 2017 10:36:51 +0000 (12:36 +0200)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/radosgw-admin/help.t	patch \|	diff1 \|	diff2 \|	blob \| history