Merge branch 'testing' into unstable

author Sage Weil <sage@newdream.net>

Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)

committer Sage Weil <sage@newdream.net>

Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)
author Sage Weil <sage@newdream.net>
Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)
committer Sage Weil <sage@newdream.net>
Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/msg/SimpleMessenger.cc
Simple merge
diff --cc src/os/JournalingObjectStore.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)
committer	Sage Weil <sage@newdream.net>
	Mon, 3 Jan 2011 23:15:26 +0000 (15:15 -0800)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/JournalingObjectStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history