Skip to content

2022-08-25: merge of 22.0 into master

Johannes Elmsheuser requested to merge elmsheus/athena:update_25_08 into master

Daily sweep/merge of 22.0 branch into master branch.

Used Used git merge upstream/22.0.

Manually resolved merge conflicts in:

Control/AthenaConfiguration/python/AllConfigFlags.py
Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/python/ActsTrkSeedingToolConfig.py

Merge request reports