Merge pull request #12428 from SUSE/wip-18216-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 1 Feb 2017 21:38:17 +0000 (22:38 +0100)

committer GitHub <noreply@github.com>

Wed, 1 Feb 2017 21:38:17 +0000 (22:38 +0100)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 1 Feb 2017 21:38:17 +0000 (22:38 +0100)
committer GitHub <noreply@github.com>
Wed, 1 Feb 2017 21:38:17 +0000 (22:38 +0100)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
diff --cc src/test/cli/radosgw-admin/help.t
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 1 Feb 2017 21:38:17 +0000 (22:38 +0100)
committer	GitHub <noreply@github.com>
	Wed, 1 Feb 2017 21:38:17 +0000 (22:38 +0100)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/radosgw-admin/help.t	patch \|	diff1 \|	diff2 \|	blob \| history