Skip to content

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

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

Several merge conflicts were manually fixed.

  1. Trivial conflicts (white space changes) in:
  • LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdFillAlg.py
  • LArCalorimeter/LArCondUtils/share/LArHVPathologyDbWrite.py
  • LArCalorimeter/LArCondUtils/share/LArHVPathologyDbRead.py
  1. New additions in these two scripts manually added to the master :
  • PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py
  • PhysicsAnalysis/DerivationFramework/DerivationFrameworkConfiguration/python/DerivationConfigList.py

Merge request reports