Merge remote branch 'origin/testing' into unstable

author Sage Weil <sage@newdream.net>

Thu, 6 Jan 2011 00:48:11 +0000 (16:48 -0800)

committer Sage Weil <sage@newdream.net>

Thu, 6 Jan 2011 00:48:11 +0000 (16:48 -0800)
author Sage Weil <sage@newdream.net>
Thu, 6 Jan 2011 00:48:11 +0000 (16:48 -0800)
committer Sage Weil <sage@newdream.net>
Thu, 6 Jan 2011 00:48:11 +0000 (16:48 -0800)
diff --cc src/mds/MDLog.cc
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 6 Jan 2011 00:48:11 +0000 (16:48 -0800)
committer	Sage Weil <sage@newdream.net>
	Thu, 6 Jan 2011 00:48:11 +0000 (16:48 -0800)
		1	2
src/mds/MDLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history