Merge pull request #22100 from joscollin/wip-rgw-period

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

Tue, 22 May 2018 15:15:45 +0000 (11:15 -0400)

committer GitHub <noreply@github.com>

Tue, 22 May 2018 15:15:45 +0000 (11:15 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Tue, 22 May 2018 15:15:45 +0000 (11:15 -0400)
committer GitHub <noreply@github.com>
Tue, 22 May 2018 15:15:45 +0000 (11:15 -0400)
diff --cc doc/man/8/radosgw-admin.rst
Simple merge
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>
	Tue, 22 May 2018 15:15:45 +0000 (11:15 -0400)
committer	GitHub <noreply@github.com>
	Tue, 22 May 2018 15:15:45 +0000 (11:15 -0400)
		1	2
doc/man/8/radosgw-admin.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/radosgw-admin/help.t	patch \|	diff1 \|	diff2 \|	blob \| history