Merge branch 'mix_stale' into unstable

author Sage Weil <sage@newdream.net>

Sat, 6 Nov 2010 00:08:10 +0000 (17:08 -0700)

committer Sage Weil <sage@newdream.net>

Sat, 6 Nov 2010 00:08:10 +0000 (17:08 -0700)
author Sage Weil <sage@newdream.net>
Sat, 6 Nov 2010 00:08:10 +0000 (17:08 -0700)
committer Sage Weil <sage@newdream.net>
Sat, 6 Nov 2010 00:08:10 +0000 (17:08 -0700)
diff --cc src/mds/CInode.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/mdstypes.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 6 Nov 2010 00:08:10 +0000 (17:08 -0700)
committer	Sage Weil <sage@newdream.net>
	Sat, 6 Nov 2010 00:08:10 +0000 (17:08 -0700)
		1	2
src/mds/CInode.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/mdstypes.h	patch \|	diff1 \|	diff2 \|	blob \| history