Merge remote branch 'origin/testing' into unstable

author Sage Weil <sage@newdream.net>

Mon, 23 Aug 2010 17:32:18 +0000 (10:32 -0700)

committer Sage Weil <sage@newdream.net>

Mon, 23 Aug 2010 17:32:18 +0000 (10:32 -0700)
author Sage Weil <sage@newdream.net>
Mon, 23 Aug 2010 17:32:18 +0000 (10:32 -0700)
committer Sage Weil <sage@newdream.net>
Mon, 23 Aug 2010 17:32:18 +0000 (10:32 -0700)
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/mds/Server.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 23 Aug 2010 17:32:18 +0000 (10:32 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 23 Aug 2010 17:32:18 +0000 (10:32 -0700)
		1	2
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.h	patch \|	diff1 \|	diff2 \|	blob \| history