Merge remote branch 'origin/timer-fixes' into unstable

author Sage Weil <sage@newdream.net>

Sun, 7 Nov 2010 17:45:09 +0000 (09:45 -0800)

committer Sage Weil <sage@newdream.net>

Sun, 7 Nov 2010 17:45:09 +0000 (09:45 -0800)
author Sage Weil <sage@newdream.net>
Sun, 7 Nov 2010 17:45:09 +0000 (09:45 -0800)
committer Sage Weil <sage@newdream.net>
Sun, 7 Nov 2010 17:45:09 +0000 (09:45 -0800)
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 7 Nov 2010 17:45:09 +0000 (09:45 -0800)
committer	Sage Weil <sage@newdream.net>
	Sun, 7 Nov 2010 17:45:09 +0000 (09:45 -0800)
		1	2
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history