Merge branch 'unstable' into msgr

author Sage Weil <sage@newdream.net>

Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)

committer Sage Weil <sage@newdream.net>

Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)
author Sage Weil <sage@newdream.net>
Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)
committer Sage Weil <sage@newdream.net>
Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)
committer	Sage Weil <sage@newdream.net>
	Wed, 2 Sep 2009 23:31:08 +0000 (16:31 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history