git.arvados.org - arvados.git/commit

projects / arvados.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e98e166 0c731f4)

author	Peter Amstutz <peter.amstutz@curii.com>
	Mon, 3 Jun 2024 14:16:17 +0000 (10:16 -0400)
committer	Peter Amstutz <peter.amstutz@curii.com>
	Mon, 3 Jun 2024 14:16:17 +0000 (10:16 -0400)
commit	6fa7f9fbcf20aa866eed0618bd09e1ce2e109baa
tree	8bc0c40a0f28022e84ab588f23a16ff548533a09	tree \| snapshot
parent	e98e166ceab6e377036fc87ce31e4d0d5238994f	commit \| diff
parent	0c731f41511ab1fbfa08b2de7967ca1df5f7f28d	commit \| diff

Merge branch 'main' into 15397-remove-obsolete-apis

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

14 files changed:

doc/admin/upgrading.html.textile.liquid	diff1 \|	diff2 \|	blob \| history
lib/config/config.default.yml	diff1 \|	diff2 \|	blob \| history
sdk/go/arvados/config.go	diff1 \|	diff2 \|	blob \| history
sdk/python/arvados-v1-discovery.json	diff1 \|	diff2 \|	blob \| history
sdk/python/arvados/api.py	diff1 \|	diff2 \|	blob \| history
sdk/python/arvados/collection.py	diff1 \|	diff2 \|	blob \| history
sdk/python/arvados/keep.py	diff1 \|	diff2 \|	blob \| history
sdk/python/arvados/util.py	diff1 \|	diff2 \|	blob \| history
sdk/python/tests/arvados_testutil.py	diff1 \|	diff2 \|	blob \| history
sdk/python/tests/test_arv_keepdocker.py	diff1 \|	diff2 \|	blob \| history
sdk/python/tests/test_collections.py	diff1 \|	diff2 \|	blob \| history
sdk/python/tests/test_keep_client.py	diff1 \|	diff2 \|	blob \| history
sdk/python/tests/test_util.py	diff1 \|	diff2 \|	blob \| history
services/workbench2/src/views-components/data-explorer/renderers.tsx	diff1 \|	diff2 \|	blob \| history