Merge pull request #22363 from mdw-at-linuxbox/wip-luminous-rgw-implt

author Yuri Weinstein <yweinste@redhat.com>

Thu, 7 Jun 2018 22:10:47 +0000 (15:10 -0700)

committer GitHub <noreply@github.com>

Thu, 7 Jun 2018 22:10:47 +0000 (15:10 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 7 Jun 2018 22:10:47 +0000 (15:10 -0700)
committer GitHub <noreply@github.com>
Thu, 7 Jun 2018 22:10:47 +0000 (15:10 -0700)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 7 Jun 2018 22:10:47 +0000 (15:10 -0700)
committer	GitHub <noreply@github.com>
	Thu, 7 Jun 2018 22:10:47 +0000 (15:10 -0700)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history