Merge remote branch 'origin/large_objects' into unstable

author Sage Weil <sage@newdream.net>

Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)

committer Sage Weil <sage@newdream.net>

Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)
author Sage Weil <sage@newdream.net>
Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)
committer Sage Weil <sage@newdream.net>
Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)
diff --cc src/config.cc
Simple merge
diff --cc src/config.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)
committer	Sage Weil <sage@newdream.net>
	Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)
		1	2
src/config.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history