Merge pull request #1405 from ceph/wip-7575

author Sage Weil <sage@inktank.com>

Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)

committer Sage Weil <sage@inktank.com>

Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)
author Sage Weil <sage@inktank.com>
Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)
committer Sage Weil <sage@inktank.com>
Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)
committer	Sage Weil <sage@inktank.com>
	Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history