2022-11-25: daily merge of 22.0 into master (!58712) · Merge requests · atlas / athena · GitLab

Frank Winklmeier requested to merge fwinkl/athena:sweep_22.0_master_2022-11-25 into master Nov 25, 2022

Resolved conflicts:

ComponentAccumulator.py
AthMonitorAlgorithm
MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/MuonClusterOnTrackCreator.h
PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/CMakeLists.txt
PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py

Rejected changes:

DataQuality/DataQualityUtils/scripts/DeMo* (see !58458 (comment 6226268))