Merge pull request #23099 from adamemerson/wip-all-your-fault

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

Fri, 20 Jul 2018 13:57:10 +0000 (09:57 -0400)

committer GitHub <noreply@github.com>

Fri, 20 Jul 2018 13:57:10 +0000 (09:57 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Fri, 20 Jul 2018 13:57:10 +0000 (09:57 -0400)
committer GitHub <noreply@github.com>
Fri, 20 Jul 2018 13:57:10 +0000 (09:57 -0400)
diff --cc src/common/options.cc
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, 20 Jul 2018 13:57:10 +0000 (09:57 -0400)
committer	GitHub <noreply@github.com>
	Fri, 20 Jul 2018 13:57:10 +0000 (09:57 -0400)
		1	2
src/common/options.cc	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