Merge pull request #10000 from weiqiaomiao/wqm-wip-add-userlist-cli

author Matt Benjamin <mbenjamin@redhat.com>

Fri, 1 Jul 2016 15:40:08 +0000 (11:40 -0400)

committer GitHub <noreply@github.com>

Fri, 1 Jul 2016 15:40:08 +0000 (11:40 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Fri, 1 Jul 2016 15:40:08 +0000 (11:40 -0400)
committer GitHub <noreply@github.com>
Fri, 1 Jul 2016 15:40:08 +0000 (11:40 -0400)
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>
	Fri, 1 Jul 2016 15:40:08 +0000 (11:40 -0400)
committer	GitHub <noreply@github.com>
	Fri, 1 Jul 2016 15:40:08 +0000 (11:40 -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