]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15051 from asheplyakov/19910-bp-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Tue, 22 Aug 2017 08:00:07 +0000 (10:00 +0200)
committerGitHub <noreply@github.com>
Tue, 22 Aug 2017 08:00:07 +0000 (10:00 +0200)
jewel: build/ops: extended, customizable systemd ceph-disk timeout

Reviewed-by: David Disseldorp <ddiss@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Trivial merge