From: Sage Weil <sage@inktank.com>
Date: Fri, 30 May 2014 23:28:40 +0000 (-0700)
Subject: Merge pull request #266 from ceph/wip-8489
X-Git-Tag: 1.1.0~1424
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=241a102568eff2e4ce2e47403aa80737e29364cf;p=teuthology.git

Merge pull request #266 from ceph/wip-8489

Give daemons a five-minute timeout for stopping

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

241a102568eff2e4ce2e47403aa80737e29364cf