Merge branch '11453-federated-tokens'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 8 Dec 2017 14:34:09 +0000 (09:34 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 8 Dec 2017 14:34:09 +0000 (09:34 -0500)
commite21d1ca94f6d3ed5480e5a51e92ddb002c8a09fb
tree8dfbf8f28871c132d4da5e4e3cd91fa6ffa8c1d8
parentee8558ddd313b037e94f3342cee304f8bd3e5e66
parent934b2b25199cb4696fe6ad38406b3ec1cec8f9e8
Merge branch '11453-federated-tokens'

refs #11453

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