Merge pull request #1798 from ceph/wip-8319

author Sage Weil <sage@inktank.com>

Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)
author Sage Weil <sage@inktank.com>
Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history