Daily merge of 22.0 into master, Sept 19 (!56847) · Merge requests · atlas / athena

Walter Lampl requested to merge Rel22ToMaster_Sept19 into master Sep 19, 2022

Done using git merge --strategy-option ours upstream/22.0

Conflicts w/o strategy-option:

both modified: AtlasTest/CITest/test/RecoRun3MC.sh

both modified: Projects/Athena/version.txt

both modified: Projects/DetCommon/version.txt

both added: Tools/PROCTools/data/q446_AOD_digest.ref

both modified: Tools/WorkflowTestRunner/python/References.py

Edited Sep 20, 2022 by Walter Lampl

Daily merge of 22.0 into master, Sept 19