From: Sage Weil <sage@newdream.net>
Date: Sat, 1 Jul 2017 14:10:59 +0000 (-0500)
Subject: Merge pull request #15585 from dachary/wip-20229-ceph-disk-timeout
X-Git-Tag: ses5-milestone8^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70a990797ff202cc49248565dc9240575a2a68f0;p=ceph.git

Merge pull request #15585 from dachary/wip-20229-ceph-disk-timeout

ceph-disk: set the default systemd unit timeout to 3h

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

70a990797ff202cc49248565dc9240575a2a68f0