Merge branch 'TM-ATR-21589_merging2' into 'master' (3456806c) · Commits · Peter Sherwood / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

3456806c

Commit 3456806c authored 4 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'TM-ATR-21589_merging2' into 'master'

ATR-21589: Automate the merging strategy

See merge request atlas/athena!37397

parents 04c6b712 56b73ce5

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py 1 addition, 1 deletion

...TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py 31 additions, 0 deletions

...n/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py 25 additions, 25 deletions

...rCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py 2 additions, 2 deletions

...n/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py 5 additions, 1 deletion

...gerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py 1 addition, 0 deletions

...TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py 2 additions, 2 deletions

...gerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py

with 67 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment