2022-08-24: merge of 22.0 into master (!56160) · Merge requests · atlas / athena

Johannes Elmsheuser requested to merge elmsheus/athena:update_24_08 into master Aug 24, 2022

Daily sweep/merge of 22.0 branch into master branch.

Used git merge --strategy-option ours upstream/22.0 to resolve merge conflicts in:

Projects/VP1Light/version.txt
Projects/DetCommon/version.txt
Projects/Athena/version.txt
Projects/AthSimulation/version.txt
Projects/AthDataQuality/version.txt
PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py

Used git cherry-pick 91c42b977d1f54c3a74bfbb13b3c7787f9f7926e for PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py and manually resolved a merge conflict.

2022-08-24: merge of 22.0 into master

Merge request reports