Merge branch '14758-keepproxy-panic'
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 1 Apr 2019 15:16:58 +0000 (11:16 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 1 Apr 2019 15:16:58 +0000 (11:16 -0400)
commit82d4b75769f5cc33001dcc016762651a911f7297
tree84bc1fa13199249414883b29e7a7f3d689146726
parenta60f73b173ee31d49f41137ce67930d60a25ea6d
parente289702131cc103f1e14d94ed49bdc62e0d5d8d7
Merge branch '14758-keepproxy-panic'

fixes #14758

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