Merge remote branch 'origin/testing' into unstable

author Sage Weil <sage@newdream.net>

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

committer Sage Weil <sage@newdream.net>

Sun, 7 Nov 2010 17:42:51 +0000 (09:42 -0800)
author Sage Weil <sage@newdream.net>
Sun, 7 Nov 2010 17:42:51 +0000 (09:42 -0800)
committer Sage Weil <sage@newdream.net>
Sun, 7 Nov 2010 17:42:51 +0000 (09:42 -0800)
diff --cc src/config.cc
Simple merge
diff --cc src/config.h
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/mds/MDSMap.cc
Simple merge
diff --cc src/mds/MDSMap.h
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 7 Nov 2010 17:42:51 +0000 (09:42 -0800)
committer	Sage Weil <sage@newdream.net>
	Sun, 7 Nov 2010 17:42:51 +0000 (09:42 -0800)
		1	2
src/config.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSMap.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history