projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f877728
54d8c4e
)
Merge branch '16669-oidc-access-token-fed'
author
Tom Clegg <tom@curii.com>
Wed, 10 Mar 2021 19:22:58 +0000
(14:22 -0500)
committer
Tom Clegg <tom@curii.com>
Wed, 10 Mar 2021 19:22:58 +0000
(14:22 -0500)
refs #16669
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
1
2
lib/controller/federation/conn.go
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/controller/federation/conn.go
Simple merge