Merge branch '13219-jobs-time-limit'
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 2 Jul 2018 18:12:32 +0000 (15:12 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 2 Jul 2018 18:12:32 +0000 (15:12 -0300)
Closes #13219

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge