From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Thu, 22 Aug 2019 15:50:53 +0000 (-0400)
Subject: Merge branch '14715-keepprox-config'
X-Git-Tag: 2.0.0~215
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ef23c3d124b24a461f6947868a28e67e7a0a1010

Merge branch '14715-keepprox-config'

refs #14715

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

ef23c3d124b24a461f6947868a28e67e7a0a1010