From: Ward Vandewege <ward@curii.com>
Date: Fri, 12 Mar 2021 20:09:20 +0000 (-0500)
Subject: Merge branch '17119-controller-bugfix'
X-Git-Tag: 2.2.0~107
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/949e4651a74241a184c1c63c59d7533b86f2dc52

Merge branch '17119-controller-bugfix'

refs #17119

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

949e4651a74241a184c1c63c59d7533b86f2dc52