Daily merge for 22.0 into master, Sept 22
Manual conflict resolution in Tools/PROCTools/data/q445_AOD_diff-exclusion-list.txt
Merge request reports
Activity
This merge request affects 4 packages:
- Tools/PROCTools
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigMonitoring/TrigHLTMonitoring
- Trigger/TrigT1/L1Topo/L1TopoSimulation
Affected files list will not be printed in this case
Adding @jchapman ,@orlando ,@jmharris ,@dbakshig ,@iriu ,@ebergeas ,@serodrig ,@jodafons ,@fernando ,@cmorenom ,@paulama ,@safarzad ,@asonay ,@cjmeyer as watchers
CI Result SUCCESS (hash 4c669029)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59282]added review-approved label and removed review-pending-level-1 label
mentioned in commit 35bc72af
added sweep:ignore label