Merge branch '7478-s-preemptable-preemptible'
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 19 Jun 2018 21:21:57 +0000 (18:21 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 19 Jun 2018 21:21:57 +0000 (18:21 -0300)
Refs #7478

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


Trivial merge