Merge pull request #21674 from pdvian/wip-23865-luminous

author Sage Weil <sage@newdream.net>

Tue, 15 May 2018 21:14:10 +0000 (16:14 -0500)

committer GitHub <noreply@github.com>

Tue, 15 May 2018 21:14:10 +0000 (16:14 -0500)
author Sage Weil <sage@newdream.net>
Tue, 15 May 2018 21:14:10 +0000 (16:14 -0500)
committer GitHub <noreply@github.com>
Tue, 15 May 2018 21:14:10 +0000 (16:14 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 15 May 2018 21:14:10 +0000 (16:14 -0500)
committer	GitHub <noreply@github.com>
	Tue, 15 May 2018 21:14:10 +0000 (16:14 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history