projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb3b32f
677b58d
)
11453: Merge branch 'master' into 11453-federated-tokens
author
Tom Clegg <tclegg@veritasgenetics.com>
Wed, 29 Nov 2017 06:23:31 +0000
(
01:23
-0500)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Wed, 29 Nov 2017 06:23:31 +0000
(
01:23
-0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
Trivial merge