Skip to content

2022-08-26: merge of 22.0 into master

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

Daily sweep/merge of 22.0 branch into master branch.

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

Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/python/ActsTrkSeedingToolConfig.py
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.h
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
Control/AthenaConfiguration/python/AllConfigFlags.py

@tdado and @lshi could you please check if the InDetJiveXML related updates are correct since you simultaneously edited these files in the master and 22.0 branch.

Merge request reports