Merge branch 'mds' into unstable

author Sage Weil <sage@newdream.net>

Tue, 30 Mar 2010 19:22:37 +0000 (12:22 -0700)

committer Sage Weil <sage@newdream.net>

Tue, 30 Mar 2010 19:22:37 +0000 (12:22 -0700)
author Sage Weil <sage@newdream.net>
Tue, 30 Mar 2010 19:22:37 +0000 (12:22 -0700)
committer Sage Weil <sage@newdream.net>
Tue, 30 Mar 2010 19:22:37 +0000 (12:22 -0700)
diff --cc src/TODO
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 30 Mar 2010 19:22:37 +0000 (12:22 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 30 Mar 2010 19:22:37 +0000 (12:22 -0700)
		1	2
src/TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history