Skip to content

2022-08-15: Daily merge of 22.0 into master

Tadej Novakrequested to merge
tadej/athena:sweep-2022-08-15 into master

Merging nightly/22.0/2022-08-15T2101 into master.

Conflicts (always taken newest):

  • MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx
  • MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/MuonPRDCacheCreator.cxx
  • MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/MuonTesterBranch.h
  • MuonSpectrometer/MuonValidation/MuonTesterTree/Root/MuonTesterBranch.cxx
  • Simulation/Digitization/python/DigitizationSteering.py

Fixed compilation issues:

  • Simulation/ISF/ISF_Core/ISF_Event/test/ISFTruthIncident_test.cxx

/cc @jchapman @jojungge @lmijovic

Edited by Tadej Novak

Merge request reports