From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 13 Jul 2018 20:31:11 +0000 (-0400)
Subject: Merge branch '13497-controller'
X-Git-Tag: 1.2.0~77
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/db5107dca09b786374f06a35abb51ffc3f032abd

Merge branch '13497-controller'

refs #13497

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

db5107dca09b786374f06a35abb51ffc3f032abd