Merge pull request #9381 from weiqiaomiao/wqm-wip-rgw-align

author Casey Bodley <cbodley@users.noreply.github.com>

Fri, 3 Jun 2016 15:34:07 +0000 (11:34 -0400)

committer Casey Bodley <cbodley@users.noreply.github.com>

Fri, 3 Jun 2016 15:34:07 +0000 (11:34 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Fri, 3 Jun 2016 15:34:07 +0000 (11:34 -0400)
committer Casey Bodley <cbodley@users.noreply.github.com>
Fri, 3 Jun 2016 15:34:07 +0000 (11:34 -0400)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Fri, 3 Jun 2016 15:34:07 +0000 (11:34 -0400)
committer	Casey Bodley <cbodley@users.noreply.github.com>
	Fri, 3 Jun 2016 15:34:07 +0000 (11:34 -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