Merge branch 'testing' into unstable

author Sage Weil <sage@newdream.net>

Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)

committer Sage Weil <sage@newdream.net>

Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)
author Sage Weil <sage@newdream.net>
Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)
committer Sage Weil <sage@newdream.net>
Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)
diff --cc src/mds/CInode.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 3 Aug 2010 16:43:09 +0000 (09:43 -0700)
		1	2
src/mds/CInode.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history