From 6dc325f1cde75bc8cc1992a43b11a888a14029b1 Mon Sep 17 00:00:00 2001
From: Imma Riu <imma.riu@cern.ch>
Date: Fri, 3 Aug 2018 07:18:24 +0000
Subject: [PATCH] Merge branch 'default-hlt-global-tag' into '21.1'
update the default global HLT tag to CONDBR2-HLTP-2018-01
See merge request atlas/athena!13129
(cherry picked from commit 8a9d194917bfa1c57e586a0061039ab03b672903)
5ab69795 update the default global HLT tag to CONDBR2-HLTP-2017-04
752c49cf update to 2018-01
daa9d82a Merge branch '21.1' of ssh://gitlab.cern.ch:7999/atlas/athena into default-hlt-global-tag
---
Event/EventContainers/test/ID_ContainerTest.h | 0
Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
mode change 100644 => 100755 Event/EventContainers/test/ID_ContainerTest.h
diff --git a/Event/EventContainers/test/ID_ContainerTest.h b/Event/EventContainers/test/ID_ContainerTest.h
old mode 100644
new mode 100755
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index 31abd2a6ccc..a8cdee2c287 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -359,7 +359,7 @@ class OnlineCondTag(JobProperty):
""" Default (online) HLT conditions tag """
statusOn=True
allowedType=['str']
- StoredValue='CONDBR2-HLTP-2017-03'
+ StoredValue='CONDBR2-HLTP-2018-01'
_flags.append(OnlineCondTag)
--
GitLab