Merge pull request #1342 from ceph/wip-cache-add

author Sage Weil <sage@inktank.com>

Tue, 4 Mar 2014 05:37:56 +0000 (21:37 -0800)

committer Sage Weil <sage@inktank.com>

Tue, 4 Mar 2014 05:37:56 +0000 (21:37 -0800)
author Sage Weil <sage@inktank.com>
Tue, 4 Mar 2014 05:37:56 +0000 (21:37 -0800)
committer Sage Weil <sage@inktank.com>
Tue, 4 Mar 2014 05:37:56 +0000 (21:37 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 4 Mar 2014 05:37:56 +0000 (21:37 -0800)
committer	Sage Weil <sage@inktank.com>
	Tue, 4 Mar 2014 05:37:56 +0000 (21:37 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history