Merge branch '13493-federation-proxy'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Jul 2018 15:11:36 +0000 (11:11 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Jul 2018 15:11:36 +0000 (11:11 -0400)
commitb3b3d214f54d7909f12e60a911b02676818400b1
treed3caad5e5c2110156a7a201545032e722335c843
parent8df5b745955fafef08056a742680979b81faeb1e
parent711711827bb0c3564836707bb7d4453c60c6a98c
Merge branch '13493-federation-proxy'

refs #13493

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