[DEECo] [d3scomp/JDEECo] e08fb2: SingleThreadedExecutor renamed to Same thread exec...

[GitHub]

  Branch: refs/heads/newgen-bures
  Home:   https://github.com/d3scomp/JDEECo
  Commit: e08fb2608c1fddba55f0af499e9d70f5efdaf414
      https://github.com/d3scomp/JDEECo/commit/e08fb2608c1fddba55f0af499e9d70f5efdaf414
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SameThreadedExecutor.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SameThreadedExecutorTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java

  Log Message:
  -----------
  SingleThreadedExecutor renamed to Same thread executor


  Commit: 9cf134532b47f6f15b42fd9c31b0b26676975fdc
      https://github.com/d3scomp/JDEECo/commit/9cf134532b47f6f15b42fd9c31b0b26676975fdc
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutor.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SameThreadedExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutorTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SameThreadedExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java

  Log Message:
  -----------
  more renaming


  Commit: f6c56d88f11ec80d2a7b4e7f340736b4222f3c0c
      https://github.com/d3scomp/JDEECo/commit/f6c56d88f11ec80d2a7b4e7f340736b4222f3c0c
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutor.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutorTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java

  Log Message:
  -----------
  Merge pull request #87 from d3scomp/newgen-keznikl

SingleThreadedExecutor renamed to SameThreadExecutor


  Commit: 836ef3b5f0ee28c292fa25cf7ad438ae04429546
      https://github.com/d3scomp/JDEECo/commit/836ef3b5f0ee28c292fa25cf7ad438ae04429546
  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/executor/SameThreadExecutor.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutorTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-bures

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.java


Compare: https://github.com/d3scomp/JDEECo/compare/bd85f6200b35...836ef3b5f0ee