Merge branch 'unstable' into caps

author Sage Weil <sage@newdream.net>

Wed, 7 Jan 2009 23:12:44 +0000 (15:12 -0800)

committer Sage Weil <sage@newdream.net>

Wed, 7 Jan 2009 23:12:44 +0000 (15:12 -0800)
author Sage Weil <sage@newdream.net>
Wed, 7 Jan 2009 23:12:44 +0000 (15:12 -0800)
committer Sage Weil <sage@newdream.net>
Wed, 7 Jan 2009 23:12:44 +0000 (15:12 -0800)
diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/mds/SimpleLock.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 7 Jan 2009 23:12:44 +0000 (15:12 -0800)
committer	Sage Weil <sage@newdream.net>
	Wed, 7 Jan 2009 23:12:44 +0000 (15:12 -0800)
		1	2
src/mds/Locker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/SimpleLock.h	patch \|	diff1 \|	diff2 \|	blob \| history