Merge pull request #6492 from cxwshawn/wip-perf-fix

author Sage Weil <sage@redhat.com>

Fri, 20 Nov 2015 11:56:35 +0000 (06:56 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 20 Nov 2015 11:56:35 +0000 (06:56 -0500)
author Sage Weil <sage@redhat.com>
Fri, 20 Nov 2015 11:56:35 +0000 (06:56 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 20 Nov 2015 11:56:35 +0000 (06:56 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 20 Nov 2015 11:56:35 +0000 (06:56 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 20 Nov 2015 11:56:35 +0000 (06:56 -0500)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history