Merge pull request #12084 from hansbogert/patch-4

author Orit Wasserman <owasserm@redhat.com>

Mon, 3 Apr 2017 07:21:25 +0000 (10:21 +0300)

committer GitHub <noreply@github.com>

Mon, 3 Apr 2017 07:21:25 +0000 (10:21 +0300)
author Orit Wasserman <owasserm@redhat.com>
Mon, 3 Apr 2017 07:21:25 +0000 (10:21 +0300)
committer GitHub <noreply@github.com>
Mon, 3 Apr 2017 07:21:25 +0000 (10:21 +0300)
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, 3 Apr 2017 07:21:25 +0000 (10:21 +0300)
committer	GitHub <noreply@github.com>
	Mon, 3 Apr 2017 07:21:25 +0000 (10:21 +0300)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/radosgw-admin/help.t	patch \|	diff1 \|	diff2 \|	blob \| history