From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Fri, 5 Aug 2016 15:22:39 +0000 (-0700)
Subject: Merge pull request #10262 from dachary/wip-16580-ceph-disk-timeout
X-Git-Tag: v11.0.1~551
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8175ce07b804afd40bbefe8ed20efff8d3266ca2;p=ceph.git

Merge pull request #10262 from dachary/wip-16580-ceph-disk-timeout

ceph-disk: timeout ceph-disk to avoid blocking forever

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
---

8175ce07b804afd40bbefe8ed20efff8d3266ca2