]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #266 from ceph/wip-8489
authorSage Weil <sage@inktank.com>
Fri, 30 May 2014 23:28:40 +0000 (16:28 -0700)
committerSage Weil <sage@inktank.com>
Fri, 30 May 2014 23:28:40 +0000 (16:28 -0700)
Give daemons a five-minute timeout for stopping

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

Trivial merge