Skip to content

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

Johannes Elmsheuser requested to merge elmsheus/athena:update_02_06 into master

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

There was a MR conflict when using git merge upstream/22.0 in the following files due to missing sweep from master to 22.0 as discussed in MR !53724 (merged):

PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonConfig.py 
PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METCommonConfig.py

Used instead git merge --strategy-option ours upstream/22.0 to preserve the master branch code after discussion with @jcatmore and @wbalunas

Merge request reports