Skip to content

2024-07-11: merge of 24.0 into main

A few conflicts needed to be resolved

  • Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx (kept the main version and reverted !72906 (merged). @juesseiv we'll probably need to manually sweep !72966 (merged) into main after this MR gets merged)
  • DataQuality/DataQualityUtils/src/MonitoringFile.cxx (manual resolution)
  • Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh (main version kept)
  • Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh (main version kept)
  • Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh (main version kept)
  • Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run4_v1.py (24.0 version kept @tamartin @zhangbo)
  • MuonSpectrometer/MuonCnv/MuonNSWCommonDecode/src/STGTPPackets.cxx (24.0 version kept)
  • PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/python/PhysValMonitoringConfig.py (manual resolution @cvarni @tstreble)

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports