projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14a01f7 3b4bb3d)
Merge branch '16171-oidc'
authorTom Clegg <tom@tomclegg.ca>
Mon, 8 Jun 2020 14:17:55 +0000 (10:17 -0400)
committerTom Clegg <tom@tomclegg.ca>
Mon, 8 Jun 2020 14:17:55 +0000 (10:17 -0400)
refs #16171

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
lib/config/generated_config.go patch | diff1 | diff2 | blob | history

diff --cc lib/config/config.default.yml
Simple merge
diff --cc lib/config/generated_config.go
Simple merge