]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13197 from asheplyakov/master-18740
authorKefu Chai <tchaikov@gmail.com>
Fri, 24 Mar 2017 07:53:17 +0000 (15:53 +0800)
committerGitHub <noreply@github.com>
Fri, 24 Mar 2017 07:53:17 +0000 (15:53 +0800)
systemd/ceph-disk: make it possible to customize timeout

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge