projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22516d3 125dd3b)
18290: Merge branch 'main' into 18290-lsf-bsub-args-template
authorWard Vandewege <ward@jhvc.com>
Mon, 25 Oct 2021 15:27:37 +0000 (11:27 -0400)
committerWard Vandewege <ward@jhvc.com>
Mon, 25 Oct 2021 15:27:37 +0000 (11:27 -0400)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

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