Skip to content

Daily "22.0 to master" sweep: 09/06/22

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

This is the manual sweep of MRs from the 22.0 branch to the master branch for 09/06/22

Conflicts:

  1. Tools/WorkflowTestRunner/python/References.py, similar to one reported in !54103 (merged). Kept the master version unchanged
  2. Reconstruction/MET/METReconstruction/python/METRecCfg.py, a "funny" one. The file was changed by !53956 (merged), then swept back into 22.0 , and then !54006 (merged) modified this file by removing ^M-s. All this led to the conflict when merging master with 22.0 . Again, kept the master version unchanged

Merge request reports