]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-osd-hb'
authorSage Weil <sage@inktank.com>
Thu, 24 Jan 2013 02:40:49 +0000 (18:40 -0800)
committerSage Weil <sage@inktank.com>
Thu, 24 Jan 2013 02:40:49 +0000 (18:40 -0800)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge