Task #9611: Merged LOFAR-Release-2_16 changes back into the trunk....
Task #9611: Merged LOFAR-Release-2_16 changes back into the trunk. LCU/PPSTune/ppstune/CMakeLists.txt seems to have been added, otherwise they were in sync except for some mergeinfo
Showing
- .gitattributes 1 addition, 0 deletions.gitattributes
- CEP/DP3/CMakeLists.txt 1 addition, 1 deletionCEP/DP3/CMakeLists.txt
- CEP/Pipeline/recipes/sip/pipeline.cfg.in 1 addition, 0 deletionsCEP/Pipeline/recipes/sip/pipeline.cfg.in
- CEP/Pipeline/recipes/sip/tasks.cfg.in 3 additions, 3 deletionsCEP/Pipeline/recipes/sip/tasks.cfg.in
- LCS/MessageBus/src/Util.cc 2 additions, 1 deletionLCS/MessageBus/src/Util.cc
- LCS/MessageBus/src/messagebus.py 2 additions, 1 deletionLCS/MessageBus/src/messagebus.py
- LCU/PPSTune/CMakeLists.txt 2 additions, 0 deletionsLCU/PPSTune/CMakeLists.txt
- LCU/PPSTune/ppstune/CMakeLists.txt 6 additions, 0 deletionsLCU/PPSTune/ppstune/CMakeLists.txt
- MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in 1 addition, 1 deletionMAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in
- README 1 addition, 1 deletionREADME
- SAS/ResourceAssignment/ResourceAssignmentEstimator/service.py 12 additions, 9 deletions...ResourceAssignment/ResourceAssignmentEstimator/service.py
Loading
Please register or sign in to comment