projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9b029a 66088ca)
21126: Merge branch 'main' into 21126-trash-when-ro
authorTom Clegg <tom@curii.com>
Mon, 30 Oct 2023 16:12:55 +0000 (12:12 -0400)
committerTom Clegg <tom@curii.com>
Mon, 30 Oct 2023 16:12:55 +0000 (12:12 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
lib/config/config.default.yml 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 sdk/go/arvados/config.go
Simple merge