Merge branch 'unstable' into mix_stale

author Sage Weil <sage@newdream.net>

Sun, 7 Nov 2010 04:05:11 +0000 (21:05 -0700)

committer Sage Weil <sage@newdream.net>

Sun, 7 Nov 2010 04:05:11 +0000 (21:05 -0700)
author Sage Weil <sage@newdream.net>
Sun, 7 Nov 2010 04:05:11 +0000 (21:05 -0700)
committer Sage Weil <sage@newdream.net>
Sun, 7 Nov 2010 04:05:11 +0000 (21:05 -0700)
diff --cc src/mds/CInode.cc
Simple merge
diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/SimpleLock.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 7 Nov 2010 04:05:11 +0000 (21:05 -0700)
committer	Sage Weil <sage@newdream.net>
	Sun, 7 Nov 2010 04:05:11 +0000 (21:05 -0700)
		1	2
src/mds/CInode.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Locker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/SimpleLock.h	patch \|	diff1 \|	diff2 \|	blob \| history