[DEECo] [d3scomp/JDEECo] 2f0a43: Merge remote-tracking branch 'origin/newgen-keznik...

[GitHub]

  Branch: refs/heads/newgen-keznikl
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 2f0a435e1c18fe11766595cf4fa5b63a1f5ace51
      https://github.com/d3scomp/JDEECo/commit/2f0a435e1c18fe11766595cf4fa5b63a1f5ace51
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/AreaBasedSelector.java
    R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/DifferentAreaSelector.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
    A jdeeco-simulation-demo/test/cz/cuni/mff/d3s/jdeeco/simulation/demo/TestAreaBasedSelector.java
    R jdeeco-simulation-demo/test/cz/cuni/mff/d3s/jdeeco/simulation/demo/TestDifferentAreaSelector.java

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


  Commit: e34d5bcc564920fc68b6221c5d72f018796364b0
      https://github.com/d3scomp/JDEECo/commit/e34d5bcc564920fc68b6221c5d72f018796364b0
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M jdeeco-simulation-demo/generator/outsidersScenario.py

  Log Message:
  -----------
  One team per area


  Commit: 93da9b0d12e58e992247f6a76a81cf38a686008e
      https://github.com/d3scomp/JDEECo/commit/93da9b0d12e58e992247f6a76a81cf38a686008e
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M jdeeco-simulation-demo/generator/outsidersScenario.py

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


  Commit: 8f04bd665b0ccaa0e77ff6352bd549f1a3e63487
      https://github.com/d3scomp/JDEECo/commit/8f04bd665b0ccaa0e77ff6352bd549f1a3e63487
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java

  Log Message:
  -----------
  deployment-agnostic seed for gossip strategy


Compare: https://github.com/d3scomp/JDEECo/compare/81d25e116090...8f04bd665b0c