Merge with 'master' resolve conflicts from MR !20723 (47319004) · Commits · atlas / athena

Commit 47319004 authored 6 years ago by Marcin Nowak

Browse files

Merge with 'master' resolve conflicts from MR !20723

parents feb9e3a1 f9853745

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt 3 additions, 24 deletions

AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py 0 additions, 1 deletion

...DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py 0 additions, 6 deletions

...st/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py
AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py 5 additions, 1 deletion

...t/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.cxx 6 additions, 9 deletions

...sTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.cxx
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.h 2 additions, 2 deletions

AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.h
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx 5 additions, 8 deletions

...sTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.h 2 additions, 2 deletions

AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.h
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.cxx 9 additions, 10 deletions

...t/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.cxx
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.h 4 additions, 2 deletions

...est/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.h
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.cxx 6 additions, 52 deletions

...atabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.cxx
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.h 1 addition, 10 deletions

.../DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.h
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.cxx 9 additions, 10 deletions

...atabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.cxx
AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.h 4 additions, 1 deletion

.../DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.h
AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx 8 additions, 76 deletions

AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx
Control/AthenaConfiguration/CMakeLists.txt 4 additions, 0 deletions

Control/AthenaConfiguration/CMakeLists.txt
Control/AthenaConfiguration/python/ComponentAccumulator.py 111 additions, 100 deletions

Control/AthenaConfiguration/python/ComponentAccumulator.py
Control/AthenaConfiguration/python/UnifyProperties.py 30 additions, 2 deletions

Control/AthenaConfiguration/python/UnifyProperties.py
Control/AthenaExamples/AthExHive/share/AthExHiveCond_test.ref 19 additions, 19 deletions

...rol/AthenaExamples/AthExHive/share/AthExHiveCond_test.ref
Control/AthenaExamples/AthExHive/src/AlgA.cxx 8 additions, 7 deletions

Control/AthenaExamples/AthExHive/src/AlgA.cxx

with 236 additions and 342 deletions

Please register or to comment