Merge pull request #312 from ceph/wip-osd-hb

author Sage Weil <sage@inktank.com>

Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)

committer Sage Weil <sage@inktank.com>

Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)
author Sage Weil <sage@inktank.com>
Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)
committer Sage Weil <sage@inktank.com>
Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)
diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)
		1	2
src/ceph_osd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history