Merge pull request #27102 from adamemerson/wip-one-rados-handle-to-rule-them-all

author Casey Bodley <cbodley@users.noreply.github.com>

Fri, 22 Mar 2019 20:24:15 +0000 (16:24 -0400)

committer GitHub <noreply@github.com>

Fri, 22 Mar 2019 20:24:15 +0000 (16:24 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Fri, 22 Mar 2019 20:24:15 +0000 (16:24 -0400)
committer GitHub <noreply@github.com>
Fri, 22 Mar 2019 20:24:15 +0000 (16:24 -0400)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Fri, 22 Mar 2019 20:24:15 +0000 (16:24 -0400)
committer	GitHub <noreply@github.com>
	Fri, 22 Mar 2019 20:24:15 +0000 (16:24 -0400)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history