From: Sage Weil <sage@inktank.com>
Date: Thu, 23 May 2013 17:17:14 +0000 (-0700)
Subject: Merge pull request #312 from ceph/wip-osd-hb
X-Git-Tag: v0.64~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b2fbf21b8d51e2eb6e017ecef7384b5afb4ce55;p=ceph.git

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

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

8b2fbf21b8d51e2eb6e017ecef7384b5afb4ce55