]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 43b5cf9 64cedf6)
Merge pull request #1227 from ceph/wip-7394
authorGregory Farnum <greg@inktank.com>
Tue, 18 Feb 2014 20:34:29 +0000 (12:34 -0800)
committerGregory Farnum <greg@inktank.com>
Tue, 18 Feb 2014 20:34:29 +0000 (12:34 -0800)
commit393a202198fbe67e7c4456d18c19fdef29305b5e
tree276b2ad045573a7e1b7bf25378e0844856ee37cctree | snapshot
parent43b5cf977cd93bd5ee811491c4728701fa1a3ae2commit | diff
parent64cedf6fa3ee309cc96554286bfb805e4ca89439commit | diff
Merge pull request #1227 from ceph/wip-7394

Improve the OSD and generic monitor timeout mechanisms

Reviewed-by: Sage Weil <sage@inktank.com>
src/common/config_opts.h diff1 | diff2 | blob | history
src/mon/MonClient.h diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/OSD.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.