Skip to content
Snippets Groups Projects

Daily "22.0 to master" sweep: 19/10/22

Merged Vakhtang Tsulaia requested to merge tsulaia/athena:master-sweepfrom22_19_10 into master

Several merge conflicts on this MR.

  1. Conflict triggered by !57548 (merged). 22.0 changes pushed into master , as discussed here
  2. Conflict triggered by !57600 (merged). Again, 22.0 changes pushed into master , as discussed here
  3. Conflict triggered by !57489 (merged). 22.0 changes skipped, as discussed here

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
50 51 uint32_t bunchCrossing = 0;
51 52 bunchCrossing = ctx.eventID().bunch_crossing_id();
52 53 ATH_MSG_DEBUG("BCID: " << bunchCrossing);
54 const int eventNumber = ctx.eventID().event_number();
Please register or sign in to reply
Loading