projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8df5b74 7117118)
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)
refs #13493

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


Trivial merge