[DEECo] [d3scomp/JDEECo] aca55b: placeholder for logs folder

[GitHub]

  Branch: refs/heads/omnet-plugin
  Home:   https://github.com/d3scomp/JDEECo
  Commit: aca55b9d19bc74af2a4c1bd3e6084a6d69963f13
      https://github.com/d3scomp/JDEECo/commit/aca55b9d19bc74af2a4c1bd3e6084a6d69963f13
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    A jdeeco-network-plugin/logs/placeholder

  Log Message:
  -----------
  placeholder for logs folder


  Commit: 94fe358a989208fc64734de2ce58f4b139916290
      https://github.com/d3scomp/JDEECo/commit/94fe358a989208fc64734de2ce58f4b139916290
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-network-plugin/pom.xml
    M jdeeco-parent/pom.xml

  Log Message:
  -----------
  Updating jDEECo maven version to 3.0.0


  Commit: 75114005ab41132dfb9a4a54782ae6de3662a18b
      https://github.com/d3scomp/JDEECo/commit/75114005ab41132dfb9a4a54782ae6de3662a18b
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/InstantSchedulerMock.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
    M jdeeco-parent/pom.xml

  Log Message:
  -----------
  putting InstantSchedulerMock in network project


  Commit: 7dbb4697d150fdfefc20e5b91fa4be161d8a0620
      https://github.com/d3scomp/JDEECo/commit/7dbb4697d150fdfefc20e5b91fa4be161d8a0620
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-network-plugin/pom.xml
    A jdeeco-network-plugin/test/.gitignore
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java

  Log Message:
  -----------
  change in plugin-passing API of DEECoSimulation


  Commit: e51cdc242bd6aa986d435b49f0e071afff6d2149
      https://github.com/d3scomp/JDEECo/commit/e51cdc242bd6aa986d435b49f0e071afff6d2149
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M jdeeco-network-plugin/pom.xml

  Log Message:
  -----------
  fixing the build?


  Commit: 35bc98d577959adf8d776b4457b223409ea53edd
      https://github.com/d3scomp/JDEECo/commit/35bc98d577959adf8d776b4457b223409ea53edd
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
    A jdeeco-network-plugin/logs/placeholder
    M jdeeco-network-plugin/pom.xml
    A jdeeco-network-plugin/test/.gitignore
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/InstantSchedulerMock.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
    M jdeeco-parent/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/jDEECo-3' into omnet-plugin

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
	jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java


  Commit: 5c164aa4c45f2e63c131cee5679a8d2387fdebfe
      https://github.com/d3scomp/JDEECo/commit/5c164aa4c45f2e63c131cee5679a8d2387fdebfe
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.h

  Log Message:
  -----------
  Preliminary fix for OMNeT infrastructure packet sending


Compare: https://github.com/d3scomp/JDEECo/compare/d540dfba2212...5c164aa4c45f