13493: Merge branch 'master' into 13493-federation-proxy
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Jul 2018 14:25:45 +0000 (10:25 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Jul 2018 14:25:45 +0000 (10:25 -0400)
commit711711827bb0c3564836707bb7d4453c60c6a98c
treed3caad5e5c2110156a7a201545032e722335c843
parent66fc74001e777ac7ceff2b02cfc459b1368f42f3
parent8df5b745955fafef08056a742680979b81faeb1e
13493: Merge branch 'master' into 13493-federation-proxy

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