Merge pull request #25289 from cbodley/wip-37091-luminous

author Yuri Weinstein <yweinste@redhat.com>

Fri, 4 Jan 2019 22:50:25 +0000 (14:50 -0800)

committer GitHub <noreply@github.com>

Fri, 4 Jan 2019 22:50:25 +0000 (14:50 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 4 Jan 2019 22:50:25 +0000 (14:50 -0800)
committer GitHub <noreply@github.com>
Fri, 4 Jan 2019 22:50:25 +0000 (14:50 -0800)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 4 Jan 2019 22:50:25 +0000 (14:50 -0800)
committer	GitHub <noreply@github.com>
	Fri, 4 Jan 2019 22:50:25 +0000 (14:50 -0800)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history