projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e3dd8e 99e8567)
16535: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Tue, 18 Aug 2020 20:02:56 +0000 (16:02 -0400)
committerTom Clegg <tom@tomclegg.ca>
Tue, 18 Aug 2020 20:02:56 +0000 (16:02 -0400)
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
sdk/go/arvados/config.go patch | diff1 | diff2 | blob | history
sdk/go/arvados/fs_project_test.go patch | diff1 | diff2 | blob | history
sdk/go/arvados/fs_site_test.go patch | diff1 | diff2 | blob | history

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