Merge pull request #19581 from adamemerson/wip-cache-on-the-barrelhead

author Matt Benjamin <mbenjamin@redhat.com>

Tue, 2 Jan 2018 16:01:06 +0000 (11:01 -0500)

committer GitHub <noreply@github.com>

Tue, 2 Jan 2018 16:01:06 +0000 (11:01 -0500)
author Matt Benjamin <mbenjamin@redhat.com>
Tue, 2 Jan 2018 16:01:06 +0000 (11:01 -0500)
committer GitHub <noreply@github.com>
Tue, 2 Jan 2018 16:01:06 +0000 (11:01 -0500)
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	Matt Benjamin <mbenjamin@redhat.com>
	Tue, 2 Jan 2018 16:01:06 +0000 (11:01 -0500)
committer	GitHub <noreply@github.com>
	Tue, 2 Jan 2018 16:01:06 +0000 (11:01 -0500)
		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