Merge branch 'unstable' into filestore

author Sage Weil <sage@newdream.net>

Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)

committer Sage Weil <sage@newdream.net>

Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)
author Sage Weil <sage@newdream.net>
Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)
committer Sage Weil <sage@newdream.net>
Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)
diff --cc src/Makefile.am
Simple merge
diff --cc src/os/FileJournal.cc
Simple merge
diff --cc src/os/ObjectStore.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history