projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e4b8ac a787623)
16817: Merge branch 'main'
authorTom Clegg <tom@curii.com>
Thu, 11 Nov 2021 19:54:03 +0000 (14:54 -0500)
committerTom Clegg <tom@curii.com>
Thu, 11 Nov 2021 19:54:03 +0000 (14:54 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
doc/admin/upgrading.html.textile.liquid patch | diff1 | diff2 | blob | history
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
lib/config/export.go patch | diff1 | diff2 | blob | history
lib/config/generated_config.go patch | diff1 | diff2 | blob | history
sdk/go/arvados/config.go patch | diff1 | diff2 | blob | history

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