Skip to content
Snippets Groups Projects

2025-03-27: merge of 24.0 into main

Merged Vakhtang Tsulaia requested to merge tsulaia/athena:sweep_24.0_main_2025-03-27 into main

One conflict was on the file PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/python/L1CALOCore.py triggered by !78790 (merged), cc @thompson. I used the "educated guess" approach to resolve the conflict manually. The result may be wrong. Please double check.

One MR has been excluded from the sweep (as discussed on !78839 (closed) with @pscholer)

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading