]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb7424e bed1a5c)
Merge pull request #10262 from dachary/wip-16580-ceph-disk-timeout
authorYuri Weinstein <yuri.weinstein@gmail.com>
Fri, 5 Aug 2016 15:22:39 +0000 (08:22 -0700)
committerGitHub <noreply@github.com>
Fri, 5 Aug 2016 15:22:39 +0000 (08:22 -0700)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.