Merge branch '12983-containerd' closes #12983
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 11 Jul 2018 19:17:53 +0000 (15:17 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 11 Jul 2018 19:17:53 +0000 (15:17 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>


Trivial merge