Merge pull request #3363 from liewegas/wip-cache-fix

author Samuel Just <sam.just@inktank.com>

Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)

committer Samuel Just <sam.just@inktank.com>

Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)
author Samuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)
committer Samuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history