Merge pull request #27559 from theanalyst/wip-nautilus-38883

author Yuri Weinstein <yweinste@redhat.com>

Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -0700)

committer GitHub <noreply@github.com>

Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -0700)
committer GitHub <noreply@github.com>
Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -0700)
committer	GitHub <noreply@github.com>
	Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -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