Merge remote-tracking branch 'upstream/master' into atlasrects-4662.v3

4fb2cc1c · Soshi Tsuno · 53f796d9 · 4bd7e054 · 4fb2cc1c · 4fb2cc1c
Commit 4fb2cc1c authored 6 years ago by Soshi Tsuno
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/tauMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/tauMenu.ref
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
--- a/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py