[DEECo] [d3scomp/JDEECo] 155e89: Test suite finished(alter more tests to be added)
GitHub
noreply at github.com
Wed Nov 6 14:32:20 CET 2013
Branch: refs/heads/newgen-bures
Home: https://github.com/d3scomp/JDEECo
Commit: 155e89b18f9cdfb4737d26fdd404db0c4e208da7
https://github.com/d3scomp/JDEECo/commit/155e89b18f9cdfb4737d26fdd404db0c4e208da7
Author: muradian <muradian at d3s.mff.cuni.cz>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
Test suite finished(alter more tests to be added)
Commit: 9104c39e3b42edcd42dece144ebb655cc048dcbe
https://github.com/d3scomp/JDEECo/commit/9104c39e3b42edcd42dece144ebb655cc048dcbe
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
A jdeeco-architecture/architecture-04.11.2013.emx
M jdeeco-architecture/architecture-26.10.2013.emx
M jdeeco-architecture/reverse-jdeeco-core.tc
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/TriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java
Log Message:
-----------
Merge branch 'newgen' into newgen-iliasg
Commit: 6b2f9f3e6b50d010c33023b06c5d5dd6873a7f3a
https://github.com/d3scomp/JDEECo/commit/6b2f9f3e6b50d010c33023b06c5d5dd6873a7f3a
Author: muradian <muradian at d3s.mff.cuni.cz>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M .gitignore
A jdeeco-architecture/architecture-04.11.2013.emx
M jdeeco-architecture/architecture-26.10.2013.emx
A jdeeco-architecture/architecture-30.10.2013.emx
M jdeeco-architecture/reverse-jdeeco-core.tc
M jdeeco-core/.classpath
A jdeeco-core/logs/.gitignore
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
M jdeeco-core/pom.xml
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/AnnotationProxy.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Component.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Ensemble.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/IValuedAnnotation.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Knowledge.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/KnowledgeExchange.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Process.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/TriggerOnChange.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PNode.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ParseException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.jj
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserTokenManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/SimpleCharStream.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/Token.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/TokenMgrError.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/AnnotationParsingException.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerException.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerNotExistentException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/ExecutionListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/Executor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/OutWrapper.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/TriggerListener.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Component.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentProcess.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Condition.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Ensemble.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleDefinition.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Exchange.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/InstanceEnsemblingController.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/InstanceProcess.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Invocable.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgeChangeTrigger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgePath.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Parameter.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ParameterDirection.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNode.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeCoordinator.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeField.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMapKey.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMember.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Process.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/RuntimeMetadata.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/SchedulingSpecification.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Trigger.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentProcessImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ConditionImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleDefinitionImpl.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ExchangeImpl.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InstanceEnsemblingControllerImpl.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InstanceProcessImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InvocableImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgeChangeTriggerImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgePathImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ParameterImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeFieldImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMapKeyImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMemberImpl.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ProcessImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/SchedulingSpecificationImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/TriggerImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataFactory.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/Path.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutorTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ValueSetTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java
A jdeeco-core/test/logging.properties
Log Message:
-----------
Merge remote-tracking branch 'origin/newgen' into newgen-muradyan
Conflicts:
jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Commit: dd1ac79876cd0608904d1eec0c548c75ee3ba7e1
https://github.com/d3scomp/JDEECo/commit/dd1ac79876cd0608904d1eec0c548c75ee3ba7e1
Author: Spectrum <Spectrum at 10.10.16.105>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
test
Commit: 5f1ea30f01431a826d6b3db0dfa8476ff7ed5a8a
https://github.com/d3scomp/JDEECo/commit/5f1ea30f01431a826d6b3db0dfa8476ff7ed5a8a
Author: Spectrum <Spectrum at 10.10.16.105>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
Headers added
Commit: 8a789a925dd145ac59e8e3227bc08233a475500f
https://github.com/d3scomp/JDEECo/commit/8a789a925dd145ac59e8e3227bc08233a475500f
Author: Spectrum <Spectrum at 10.10.16.105>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
Done for now. Shall be extended later.
Commit: a75068e764744bad424081786a966d9f6fb4868a
https://github.com/d3scomp/JDEECo/commit/a75068e764744bad424081786a966d9f6fb4868a
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/AnnotationParsingException.java
Log Message:
-----------
changing package of AnnotationParsingException
Exceptions should be kept in the same package as the class/interface
that throws them.
Commit: 73790d7d35668c9da4b2f75ddb079b6657013259
https://github.com/d3scomp/JDEECo/commit/73790d7d35668c9da4b2f75ddb079b6657013259
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/ComponentInstanceRecord.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/ComponentInstanceRecordTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
Log Message:
-----------
Merge branch 'newgen' into newgen-iliasg
Commit: d85cf5158cf80690a309bd101ca94f7e83161904
https://github.com/d3scomp/JDEECo/commit/d85cf5158cf80690a309bd101ca94f7e83161904
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/AnnotationParsingException.java
Log Message:
-----------
Merge pull request #88 from d3scomp/newgen-iliasg
deleting exceptions package
Commit: 6b2a21891b68f37903c401e6927ac6ff575dcdb5
https://github.com/d3scomp/JDEECo/commit/6b2a21891b68f37903c401e6927ac6ff575dcdb5
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
Merge pull request #86 from d3scomp/newgen-muradyan
Scheduler completed for now. Tests for Scheduler also
Commit: 01c1481298e1b065647210793b4e44ea992887d6
https://github.com/d3scomp/JDEECo/commit/01c1481298e1b065647210793b4e44ea992887d6
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
Log Message:
-----------
fixing the build.
Commit: bd85f6200b359e338fe5d297c711602f4e4c0d7c
https://github.com/d3scomp/JDEECo/commit/bd85f6200b359e338fe5d297c711602f4e4c0d7c
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/AnnotationParsingException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/newgen' into newgen-bures
Conflicts:
jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Compare: https://github.com/d3scomp/JDEECo/compare/8290bade01d5...bd85f6200b35
More information about the DEECo
mailing list