Skip to content

2023-04-28: merge 23.0 into master

This sweep contains the following MRs:

I had to resolve conflicts in the following files:

  • InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
    • Here I rejected the changes from the commit f9b188be, since this seems to only apply to 23.0
  • Tracking/Acts/ActsInterop/python/ActsCIFlags.py
  • Tracking/TrkConfig/python/TrkTrackSummaryToolConfig.py
    • For these two, I took the changes in !62664 (merged), just making sure that for ActsCIFlags they applied to actsTrkValidateSpacePointsFlags which does not exist on 23.0

Merge request reports

Loading