git.arvados.org - arvados.git/commit

author	Peter Amstutz <peter.amstutz@curii.com>
	Tue, 22 Nov 2022 18:49:01 +0000 (13:49 -0500)
committer	Peter Amstutz <peter.amstutz@curii.com>
	Tue, 22 Nov 2022 18:49:01 +0000 (13:49 -0500)
commit	09cbdc3074b3f1e69c9c537875146f6da0a6ed8f
tree	2d7774e5206446bdb4834110d28b3d933402ac69	tree \| snapshot
parent	9828e9218084856240fdeafa2d388d8bf322e655	commit \| diff
parent	2b7d05cdf4e054024607b859bd6fb41e04855bfa	commit \| diff

Merge branch 'main' into 18842-arv-mount-disk-config

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

12 files changed:

doc/admin/maintenance-and-upgrading.html.textile.liquid	diff1 \|	diff2 \|	blob \| history
lib/config/config.default.yml	diff1 \|	diff2 \|	blob \| history
lib/config/export.go	diff1 \|	diff2 \|	blob \| history
lib/crunchrun/crunchrun.go	diff1 \|	diff2 \|	blob \| history
lib/dispatchcloud/node_size.go	diff1 \|	diff2 \|	blob \| history
lib/lsf/dispatch_test.go	diff1 \|	diff2 \|	blob \| history
sdk/cwl/arvados_cwl/__init__.py	diff1 \|	diff2 \|	blob \| history
sdk/cwl/arvados_cwl/arvcontainer.py	diff1 \|	diff2 \|	blob \| history
sdk/cwl/tests/test_container.py	diff1 \|	diff2 \|	blob \| history
sdk/go/arvados/config.go	diff1 \|	diff2 \|	blob \| history
sdk/python/setup.py	diff1 \|	diff2 \|	blob \| history
services/api/app/models/arvados_model.rb	diff1 \|	diff2 \|	blob \| history