Merge pull request #18007 from yehudasa/wip-rgw-config-desc

author Yehuda Sadeh <yehuda@redhat.com>

Tue, 14 Nov 2017 20:31:28 +0000 (15:31 -0500)

committer GitHub <noreply@github.com>

Tue, 14 Nov 2017 20:31:28 +0000 (15:31 -0500)
author Yehuda Sadeh <yehuda@redhat.com>
Tue, 14 Nov 2017 20:31:28 +0000 (15:31 -0500)
committer GitHub <noreply@github.com>
Tue, 14 Nov 2017 20:31:28 +0000 (15:31 -0500)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Tue, 14 Nov 2017 20:31:28 +0000 (15:31 -0500)
committer	GitHub <noreply@github.com>
	Tue, 14 Nov 2017 20:31:28 +0000 (15:31 -0500)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history