From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 20 Jul 2018 14:25:45 +0000 (-0400)
Subject: 13493: Merge branch 'master' into 13493-federation-proxy
X-Git-Tag: 1.2.0~64^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/711711827bb0c3564836707bb7d4453c60c6a98c

13493: Merge branch 'master' into 13493-federation-proxy

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

711711827bb0c3564836707bb7d4453c60c6a98c