Merge pull request #25448 from smithfarm/wip-37519-luminous

author Yuri Weinstein <yweinste@redhat.com>

Mon, 7 Jan 2019 16:26:03 +0000 (08:26 -0800)

committer GitHub <noreply@github.com>

Mon, 7 Jan 2019 16:26:03 +0000 (08:26 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 7 Jan 2019 16:26:03 +0000 (08:26 -0800)
committer GitHub <noreply@github.com>
Mon, 7 Jan 2019 16:26:03 +0000 (08:26 -0800)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rest_user.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 7 Jan 2019 16:26:03 +0000 (08:26 -0800)
committer	GitHub <noreply@github.com>
	Mon, 7 Jan 2019 16:26:03 +0000 (08:26 -0800)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_user.cc	patch \|	diff1 \|	diff2 \|	blob \| history