Merge branch 'scrub_no_lock' into unstable

author Sage Weil <sage@newdream.net>

Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)

committer Sage Weil <sage@newdream.net>

Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)
author Sage Weil <sage@newdream.net>
Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)
committer Sage Weil <sage@newdream.net>
Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history