Skip to content

2022-08-26: merge of 22.0 into master #2

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

Daily sweep/merge of 22.0 branch into master branch number #2 for 2022-08-26.

Used git merge --strategy-option ours upstream/22.0 to give preference to the master branch code in merge conflicts of:

Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/python/ActsTrkSeedingToolConfig.py
Projects/VP1Light/version.txt
Projects/DetCommon/version.txt
Projects/Athena/version.txt
Projects/AthSimulation/version.txt
Projects/AthDataQuality/version.txt
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.h
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
Control/AthenaConfiguration/python/AllConfigFlags.py

Merge request reports