From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Wed, 29 Nov 2017 06:23:31 +0000 (-0500)
Subject: 11453: Merge branch 'master' into 11453-federated-tokens
X-Git-Tag: 1.1.2~25^2~12
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f15c51d123da2db1deeeb0e76685cf17eb56e039

11453: Merge branch 'master' into 11453-federated-tokens

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

f15c51d123da2db1deeeb0e76685cf17eb56e039