projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd9367a 2544aab)
15759: Merge branch 'master' into 15759-deploy-crunch-run
authorTom Clegg <tom@tomclegg.ca>
Tue, 31 Dec 2019 16:34:34 +0000 (11:34 -0500)
committerTom Clegg <tom@tomclegg.ca>
Tue, 31 Dec 2019 16:34:34 +0000 (11:34 -0500)
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