Merge branch 'mixed.AthenaKernel-20181211' into 'master'
AthenaKernel+others: Support mixed conditions containers. See merge request atlas/athena!16662
No related branches found
No related tags found
Showing
- Control/AthenaKernel/AthenaKernel/CondCont.h 533 additions, 11 deletionsControl/AthenaKernel/AthenaKernel/CondCont.h
- Control/AthenaKernel/AthenaKernel/CondCont.icc 155 additions, 6 deletionsControl/AthenaKernel/AthenaKernel/CondCont.icc
- Control/AthenaKernel/share/CondCont_test.ref 11 additions, 1 deletionControl/AthenaKernel/share/CondCont_test.ref
- Control/AthenaKernel/src/CondCont.cxx 574 additions, 178 deletionsControl/AthenaKernel/src/CondCont.cxx
- Control/AthenaKernel/test/CondCont_test.cxx 376 additions, 4 deletionsControl/AthenaKernel/test/CondCont_test.cxx
- Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx 1 addition, 0 deletionsControl/AthenaServices/src/DelayedConditionsCleanerSvc.cxx
- Control/AthenaServices/test/ConditionsCleanerSvc_test.cxx 33 additions, 1 deletionControl/AthenaServices/test/ConditionsCleanerSvc_test.cxx
- Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx 38 additions, 1 deletion.../AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
- Control/DataModelTest/DataModelRunTests/share/CondReader.ref 226 additions, 66 deletionsControl/DataModelTest/DataModelRunTests/share/CondReader.ref
- Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref 251 additions, 82 deletions...ol/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
- Control/DataModelTest/DataModelRunTests/share/CondReader_jo.py 14 additions, 5 deletions...ol/DataModelTest/DataModelRunTests/share/CondReader_jo.py
- Control/DataModelTest/DataModelRunTests/share/CondWriter.ref 30 additions, 10 deletionsControl/DataModelTest/DataModelRunTests/share/CondWriter.ref
- Control/DataModelTest/DataModelRunTests/share/CondWriter_jo.py 24 additions, 2 deletions...ol/DataModelTest/DataModelRunTests/share/CondWriter_jo.py
- Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/DataModelTestDataCommonDict.h 2 additions, 1 deletion...mon/DataModelTestDataCommon/DataModelTestDataCommonDict.h
- Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3.h 39 additions, 0 deletions...Test/DataModelTestDataCommon/DataModelTestDataCommon/S3.h
- Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3Cond.h 25 additions, 0 deletions.../DataModelTestDataCommon/DataModelTestDataCommon/S3Cond.h
- Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/selection.xml 1 addition, 0 deletions...ModelTestDataCommon/DataModelTestDataCommon/selection.xml
- Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.cxx 87 additions, 0 deletions...ol/DataModelTest/DataModelTestDataCommon/src/CondAlg2.cxx
- Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.h 63 additions, 0 deletionsControl/DataModelTest/DataModelTestDataCommon/src/CondAlg2.h
- Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx 26 additions, 1 deletion...taModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
Loading
Please register or sign in to comment