Merge branch 'cherry-pick-51ccbe0c [formerly 84b6f615]-21.0-mc16d' into '21.0-mc16d'
Sweeping !6384 from 21.0 to 21.0-mc16d. New Metadata merge feature for SharedWriter in AthenaMP See merge request !6489 Former-commit-id: ea8d0e40
Showing
- Control/AthenaServices/src/AthenaSharedMemoryTool.cxx 1 addition, 1 deletionControl/AthenaServices/src/AthenaSharedMemoryTool.cxx
- Control/AthenaServices/src/MetaDataSvc.cxx 143 additions, 44 deletionsControl/AthenaServices/src/MetaDataSvc.cxx
- Control/AthenaServices/src/MetaDataSvc.h 7 additions, 1 deletionControl/AthenaServices/src/MetaDataSvc.h
- Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx 159 additions, 139 deletions...base/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
- Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h 2 additions, 0 deletionsDatabase/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
- Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt 2 additions, 1 deletionDatabase/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
- Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx 23 additions, 0 deletionsDatabase/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx
- Database/AthenaPOOL/OutputStreamAthenaPool/src/CopyEventStreamInfo.cxx 54 additions, 40 deletions...naPOOL/OutputStreamAthenaPool/src/CopyEventStreamInfo.cxx
- Database/PersistentDataModel/src/Placement.cxx 8 additions, 2 deletionsDatabase/PersistentDataModel/src/Placement.cxx
- Database/PersistentDataModel/src/Token.cxx 8 additions, 2 deletionsDatabase/PersistentDataModel/src/Token.cxx
- Event/EventBookkeeperTools/src/CutFlowSvc.cxx 4 additions, 0 deletionsEvent/EventBookkeeperTools/src/CutFlowSvc.cxx
Loading
Please register or sign in to comment