Skip to content

Daily "22.0 to master" sweep: 03/08/22

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

Merge conflicts:

  • Several version.txt files
  • Two minor conflicts in the PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss package caused by manual sweep of !55324 (merged) into 22.0. Retained the master version of the code.
  • Conflict generated by Tools/PROCTools/data/x658_AOD_content.ref which has been removed from master, but still exists in 22.0. Ignored 22.0 changes.
  • Minor conflicts related to !55502 (merged) in two files: InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py and Reconstruction/tauRec/python/TauToolHolder.py. Kept the master version of the code after discussion with the developers

Manual fixes have bee applied to two files InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py and Reconstruction/VKalVrt/VrtSecInclusive/python/VrtSecInclusiveConfig.py as per these instructions

Merge request reports