Skip to content

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

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

Several conflicts in this sweep

  • Tools/WorkflowTestRunner/python/References.py. Kept the master version
  • MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/MuonClusterSegmentFinderTool.h. Kept the master version
  • Simulation/ISF/ISF_Core/ISF_Event/test/ISFTruthIncident_test.cxx. Used the version from 22.0, and then patched it to make consistent with the master version prior to the sweep

Merge request reports