# Conflicts:
#	.bumpversion.toml
#	.gitlab-ci.yml
#	apps/cli/executables/go/spelunker/main.go
#	apps/cli/executables/pexable/carta_envoy/carta_envoy/__init__.py
#	apps/cli/executables/pexable/carta_envoy/pyproject.toml
#	apps/cli/executables/pexable/casa_envoy/casa_envoy/__init__.py
#	apps/cli/executables/pexable/casa_envoy/pyproject.toml
#	apps/cli/executables/pexable/conveyor/conveyor/__init__.py
#	apps/cli/executables/pexable/conveyor/pyproject.toml
#	apps/cli/executables/pexable/data_annotator/data_annotator/__init__.py
#	apps/cli/executables/pexable/data_annotator/pyproject.toml
#	apps/cli/executables/pexable/deliver/delivery/__init__.py
#	apps/cli/executables/pexable/deliver/pyproject.toml
#	apps/cli/executables/pexable/ingest_envoy/ingest_envoy/__init__.py
#	apps/cli/executables/pexable/ingest_envoy/pyproject.toml
#	apps/cli/executables/pexable/mediator/pyproject.toml
#	apps/cli/executables/pexable/mediator/system_mediator/__init__.py
#	apps/cli/executables/pexable/null/null/__init__.py
#	apps/cli/executables/pexable/null/pyproject.toml
#	apps/cli/executables/pexable/productfetcher/productfetcher/__init__.py
#	apps/cli/executables/pexable/productfetcher/pyproject.toml
#	apps/cli/executables/pexable/update_stage/pyproject.toml
#	apps/cli/executables/pexable/update_stage/update_stage/__init__.py
#	apps/cli/executables/pexable/vela/pyproject.toml
#	apps/cli/executables/pexable/vela/vela/__init__.py
#	apps/cli/executables/pexable/wf_inspector/pyproject.toml
#	apps/cli/executables/pexable/wf_inspector/wf_inspector/__init__.py
#	apps/cli/executables/pexable/ws_annihilator/pyproject.toml
#	apps/cli/executables/pexable/ws_annihilator/ws_annihilator/__init__.py
#	apps/cli/executables/pexable/ws_metrics/pyproject.toml
#	apps/cli/executables/pexable/ws_metrics/ws_metrics/__init__.py
#	apps/cli/utilities/aat_wrest/aat_wrest/__init__.py
#	apps/cli/utilities/aat_wrest/pyproject.toml
#	apps/cli/utilities/contacts_wrest/contacts_wrest/__init__.py
#	apps/cli/utilities/contacts_wrest/pyproject.toml
#	apps/cli/utilities/core_sampler/core_sampler/__init__.py
#	apps/cli/utilities/core_sampler/pyproject.toml
#	apps/cli/utilities/wf_monitor/poetry.lock
#	apps/cli/utilities/wf_monitor/pyproject.toml
#	apps/cli/utilities/wf_monitor/wf_monitor/__init__.py
#	services/capability/capability/__init__.py
#	services/capability/poetry.lock
#	services/capability/pyproject.toml
#	services/notification/notification/__init__.py
#	services/notification/poetry.lock
#	services/notification/pyproject.toml
#	services/workflow/gitlab-requirements.txt
#	services/workflow/poetry.lock
#	services/workflow/pyproject.toml
#	services/workflow/workflow/__init__.py
#	shared/messaging/messaging/__init__.py
#	shared/messaging/pyproject.toml
#	shared/workspaces/pyproject.toml
#	shared/workspaces/workspaces/__init__.py
#	shared/workspaces/workspaces/workflow/services/recovery.py

merge patch to main

See merge request !1685

force container rebuild

See merge request !1686

fix default determination to handle symlinked casa installs

See merge request !1684

update versions for patch release

See merge request !1682

WS-1405 CASA version mixup

See merge request !1683

fix typo

See merge request !1680

WS-1405 Mount CASA directories

See merge request !1681

WS-1405 Fixed workflow unit tests

See merge request !1679

Fixed capo property for tests (it's fine, we should probably validate the default instead when tests are fixed)

WS-1405 Fix matrix service's CAPO properties

See merge request !1677

undo previously requested VLASS imaging syntax changes

See merge request !1678

Switched returns to raises for error responses in views where a db transacation appeared to be open with some modified data

See merge request !1676

Switched returns to raises for error responses in views where a db transacation appeared to be open with some modified data

WS-1405 CASA matrix service

See merge request !1670

Using a new column on the capabilities table to store CAPO keys to get the default CASA paths rather than that ol' constant dict

make sure people can't create duplicate entries in the matrix

See merge request !1675

Raising instead of returning error responses to rollback potentially partially committed transactions

Moving new symlinks into the pre-existing env dir (if exists) to preserve the pre-existing links (specifically the 'default' one)