11453: Merge branch 'master' into 11453-federated-tokens
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 29 Nov 2017 06:23:31 +0000 (01:23 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 29 Nov 2017 06:23:31 +0000 (01:23 -0500)
commitf15c51d123da2db1deeeb0e76685cf17eb56e039
tree2930a93e07e4668f4d69b1e9ffec85decced3691
parentfb3b32f1aeeca1b52c1136ec48b50ea18ba71b17
parent677b58da477a5e70b53b883a56554e18148fed5e
11453: Merge branch 'master' into 11453-federated-tokens

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