From: Gregory Farnum <greg@inktank.com>
Date: Tue, 18 Feb 2014 20:34:29 +0000 (-0800)
Subject: Merge pull request #1227 from ceph/wip-7394
X-Git-Tag: v0.78~162
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=393a202198fbe67e7c4456d18c19fdef29305b5e;p=ceph.git

Merge pull request #1227 from ceph/wip-7394

Improve the OSD and generic monitor timeout mechanisms

Reviewed-by: Sage Weil <sage@inktank.com>
---

393a202198fbe67e7c4456d18c19fdef29305b5e