Merge tag 'v0.78'

author Sage Weil <sage@inktank.com>

Sat, 22 Mar 2014 17:24:25 +0000 (10:24 -0700)

committer Sage Weil <sage@inktank.com>

Sat, 22 Mar 2014 17:24:25 +0000 (10:24 -0700)
author Sage Weil <sage@inktank.com>
Sat, 22 Mar 2014 17:24:25 +0000 (10:24 -0700)
committer Sage Weil <sage@inktank.com>
Sat, 22 Mar 2014 17:24:25 +0000 (10:24 -0700)
diff --cc configure.ac
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 22 Mar 2014 17:24:25 +0000 (10:24 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 22 Mar 2014 17:24:25 +0000 (10:24 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history