Skip to content

2024-11-11: merge of 24.0 into main

A few conflicts were generated while preparing this sweep

  1. AtlasTest/CITest/Athena.cmake and ForwardDetectors/ZDC/ZdcRec/CMakeLists.txt. The ZDC unit test was kept disabled, per discussion on !75733 (closed). CC @tadej and @steinber
  2. ForwardDetectors/ZDC/ZdcNtuple/Root/ZdcNtuple.cxx. The conflict was generated by the edits implemented in !75732 (merged). I kept the main versions of the conflicting areas. CC @bcole and @steinber. Please let me know if you are happy with the conflict resolution.
  3. Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauToolsConfig.py had recent minor edits in the main (CC @ademaria) and was deleted in 24.0 (CC @jbeaucam). It is now deleted in the sweep as well.

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading