projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cfc3fe 65393f3)
Merge branch '20680-default-config-updates' refs #20680
authorPeter Amstutz <peter.amstutz@curii.com>
Mon, 7 Aug 2023 20:29:15 +0000 (16:29 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Mon, 7 Aug 2023 20:29:15 +0000 (16:29 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
tools/salt-install/local.params.example.multiple_hosts patch | diff1 | diff2 | blob | history
tools/salt-install/provision.sh patch | diff1 | diff2 | blob | history

diff --cc lib/config/config.default.yml
Simple merge
diff --cc tools/salt-install/provision.sh
Simple merge