From dd5d814245571e77febaf5803399656ad24db704 Mon Sep 17 00:00:00 2001 From: Sara Alderweireldt <sara.alderweireldt@cern.ch> Date: Wed, 26 Sep 2018 17:33:38 +0000 Subject: [PATCH] Merge branch 'cherry-pick-1448b8cdc8-21.1' into '21.1' Sweeping !14450 from 21.1-dev to 21.1. Fix bug whereby a histogram plotted twice would be modifed twice See merge request atlas/athena!14480 (cherry picked from commit 2b6b5ea9cf41700257b0d561ceea878916f3a5e9) 590c0ff2 Merge branch '21.1-dev-tida-obj' into '21.1-dev' --- Control/DataModelRoot/DataModelRoot/ATLAS_CHECK_THREAD_SAFETY | 0 Event/EventContainers/test/ID_ContainerTest.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Control/DataModelRoot/DataModelRoot/ATLAS_CHECK_THREAD_SAFETY mode change 100644 => 100755 Event/EventContainers/test/ID_ContainerTest.h diff --git a/Control/DataModelRoot/DataModelRoot/ATLAS_CHECK_THREAD_SAFETY b/Control/DataModelRoot/DataModelRoot/ATLAS_CHECK_THREAD_SAFETY old mode 100755 new mode 100644 diff --git a/Event/EventContainers/test/ID_ContainerTest.h b/Event/EventContainers/test/ID_ContainerTest.h old mode 100644 new mode 100755 -- GitLab