Skip to content
Snippets Groups Projects

2025-03-24: merge of 24.0 into main

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

Several conflicts have been resolved

  1. DataQuality/DataQualityUtils/src/MonitoringFile.cxx triggered by !78752 (merged) (@sroe) and !78738 (merged) (@wlampl). The conflict was resolved in favor of 24.0
  2. InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/src/VertexDecoratorAlg.cxx triggered by 77262 (@gfrattar) and 78662 (@tstreble). The conflict was resolved in favor of 24.0
  • Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
  • Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
  • Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh
  • Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
  • Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
  • Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh

@elmsheus, these are on your territory. I resolved all conflicts in favor of 24.0. Please confirm that you are OK with this.

The following MRs have been excluded from this sweep:

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