Skip to content
Snippets Groups Projects

sweep of various EventLoop updates from main back into 21.2

Merged Nils Erik Krumnack requested to merge krumnack/athena:el_cherry_pick into 21.2

The main thing we want here are the grid driver updates, but I figured it is easier/better to sweep everything that has been done so that I don't have to deal with merge conflicts. I left out one or two MRs that relied on code only present in main, and had to disable one newly introduced test for an experimental feature as it was having issues, and remove the new TEfficiency code for AthAnalysis.

Please note: Since this is a sweep aimed at making both branches consistent again, please restrict the review to things that really need to be fixed. Coding improvements ought to go into main and then be swept again.

List of commits swept:

cc @aforti @mborodin @calpigia

Edited by Nils Erik Krumnack

Merge request reports

Pipeline #6230362 passed

Pipeline passed for c133e5e5 on krumnack:el_cherry_pick

Approval is optional

Merged by Nils Erik KrumnackNils Erik Krumnack 1 year ago (Sep 22, 2023 1:53pm UTC)

Merge details

  • Changes merged into 21.2 with ceefaac5.
  • Deleted the source branch.

Activity

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