Skip to content

2022-07-06: Daily merge of 22.0 into master

Walter Lampl requested to merge wlampl/athena:rel22ToMaster_Jul7 into master

Daily merge of 22.0 to master. Conflicts encountered:

  • version.txt files -> keep master version
  • Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1DevHI_build.ref -> speculativly using 22.0 version
  • Tools/WorkflowTestRunner/python/References.py -> keep master version
  • MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx -> fix by hand

Merge request reports