From: Samuel Just <sam.just@inktank.com>
Date: Mon, 11 May 2015 18:09:35 +0000 (-0700)
Subject: Merge pull request #4648 from athanatos/wip-11439
X-Git-Tag: v9.0.2~188
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acf20cee1249ada9344cdff7e1f45dfe0e1a7635;p=ceph.git

Merge pull request #4648 from athanatos/wip-11439

Add separate suicide timeout configs

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

acf20cee1249ada9344cdff7e1f45dfe0e1a7635