Skip to content

2022-11-07: Daily sweep of 22.0 into master

Tadej Novak requested to merge tadej/athena:sweep-2022-11-07 into master

Conflicts:

  • Reconstruction/VKalVrt/NewVrtSecInclusiveTool/src/NewVrtSecInclusiveAlg.cxx (took reasonable things)
  • Tools/WorkflowTestRunner/python/References.py (took 22.0)
  • Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloPprMonitoring.h (deleted)
  • Trigger/TrigT1/TrigT1CaloCalibUtils/src/L1CaloPprMonitoring.cxx (deleted)

Merge request reports