]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #312 from ceph/wip-osd-hb
authorSage Weil <sage@inktank.com>
Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)
committerSage Weil <sage@inktank.com>
Thu, 23 May 2013 17:17:14 +0000 (10:17 -0700)
commit8b2fbf21b8d51e2eb6e017ecef7384b5afb4ce55
tree37fdb81f1c2eb6e894cdd6970fc451db14aaab04
parente8d0dc762f6659afe6d2a903e76850deddbf7844
parent27381c0c6259ac89f5f9c592b4bfb585937a1cfc
Merge pull request #312 from ceph/wip-osd-hb

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/ceph_osd.cc
src/mon/OSDMonitor.cc
src/osd/OSD.cc