Merge pull request #18212 from shashalu/clean-up-radosgw-admin

author Yuri Weinstein <yuri.weinstein@gmail.com>

Mon, 16 Oct 2017 19:58:05 +0000 (12:58 -0700)

committer GitHub <noreply@github.com>

Mon, 16 Oct 2017 19:58:05 +0000 (12:58 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Mon, 16 Oct 2017 19:58:05 +0000 (12:58 -0700)
committer GitHub <noreply@github.com>
Mon, 16 Oct 2017 19:58:05 +0000 (12:58 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Mon, 16 Oct 2017 19:58:05 +0000 (12:58 -0700)
committer	GitHub <noreply@github.com>
	Mon, 16 Oct 2017 19:58:05 +0000 (12:58 -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