Merge branch '13497-controller'
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 19 Jun 2018 17:45:03 +0000 (13:45 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 19 Jun 2018 17:45:03 +0000 (13:45 -0400)
commit41e15e626cc301d867c48ebb1f945bbec6b7d555
treecd927f525bf41446d675a0965e014c60c7615255
parentaf3bfbb6126ebce381c52ced87fc8af372d84118
parent43e349a8916b4e952dfafee2f88d4d2952be12c1
Merge branch '13497-controller'

refs #13497

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