Skip to content
Snippets Groups Projects

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

Merged 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

Pipeline #4656082 passed

Pipeline passed for 62715dd7 on tsulaia:master-sweepfrom22_21_10

Approval is optional

Merged by Vakhtang TsulaiaVakhtang Tsulaia 2 years ago (Oct 22, 2022 3:41pm UTC)

Merge details

  • Changes merged into master with 407f1ef5.
  • 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