projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb29c54 63005ce)
18113: Merge branch 'main' into 18113-change-cloudops-defaults
authorWard Vandewege <ward@curii.com>
Thu, 7 Oct 2021 17:26:12 +0000 (13:26 -0400)
committerWard Vandewege <ward@curii.com>
Thu, 7 Oct 2021 17:26:12 +0000 (13:26 -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