Merge remote-tracking branch 'gh/wip-perf' into next

author Sage Weil <sage@inktank.com>

Tue, 27 Nov 2012 17:29:03 +0000 (09:29 -0800)

committer Sage Weil <sage@inktank.com>

Tue, 27 Nov 2012 17:29:03 +0000 (09:29 -0800)
author Sage Weil <sage@inktank.com>
Tue, 27 Nov 2012 17:29:03 +0000 (09:29 -0800)
committer Sage Weil <sage@inktank.com>
Tue, 27 Nov 2012 17:29:03 +0000 (09:29 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osdc/ObjectCacher.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 27 Nov 2012 17:29:03 +0000 (09:29 -0800)
committer	Sage Weil <sage@inktank.com>
	Tue, 27 Nov 2012 17:29:03 +0000 (09:29 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/ObjectCacher.cc	patch \|	diff1 \|	diff2 \|	blob \| history