projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd080b3 d278c21)
16480: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Mon, 22 Jun 2020 15:35:35 +0000 (11:35 -0400)
committerTom Clegg <tom@tomclegg.ca>
Mon, 22 Jun 2020 15:35:35 +0000 (11:35 -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/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