[DEECo] [d3scomp/JDEECo] 2405ea: Architecture moved to the newgen branch.

[GitHub]

  Branch: refs/heads/newgen-muradyan
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 2405ea60b3287d6142a5619f2ab247ff1ded5c07
      https://github.com/d3scomp/JDEECo/commit/2405ea60b3287d6142a5619f2ab247ff1ded5c07
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    R jdeeco-architecture/.project
    R jdeeco-architecture/architecture.emx

  Log Message:
  -----------
  Architecture moved to the newgen branch.


  Commit: db24d2037f7710c3a48670ecb8007c3c8acf65a9
      https://github.com/d3scomp/JDEECo/commit/db24d2037f7710c3a48670ecb8007c3c8acf65a9
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md


  Commit: 82ebfad9beef6e5c73e8b6c487411e2158e55912
      https://github.com/d3scomp/JDEECo/commit/82ebfad9beef6e5c73e8b6c487411e2158e55912
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md


  Commit: 467b6ce6d1a36f1f1d72fc927b8c6311b68370fc
      https://github.com/d3scomp/JDEECo/commit/467b6ce6d1a36f1f1d72fc927b8c6311b68370fc
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M jdeeco-core-osgi/pom.xml

  Log Message:
  -----------
  Update pom.xml


  Commit: 0bc14bdc0b04ebba09d022be454a7ad77418a038
      https://github.com/d3scomp/JDEECo/commit/0bc14bdc0b04ebba09d022be454a7ad77418a038
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M jdeeco-parent/pom.xml

  Log Message:
  -----------
  Updating pom.xml


  Commit: 273356775be2ce2538ae64b25034f073f0ebd03a
      https://github.com/d3scomp/JDEECo/commit/273356775be2ce2538ae64b25034f073f0ebd03a
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md


  Commit: 024918f6c879d7a4a64bbd619ce0732b2d6f2e99
      https://github.com/d3scomp/JDEECo/commit/024918f6c879d7a4a64bbd619ce0732b2d6f2e99
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md


  Commit: 4ef713cdb464e8c672f309e23beac0a534ffb6fe
      https://github.com/d3scomp/JDEECo/commit/4ef713cdb464e8c672f309e23beac0a534ffb6fe
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M jdeeco-core-osgi/pom.xml

  Log Message:
  -----------
  Update pom.xml


  Commit: 9896437361ae3e0261e92b49892cb82885e4a6e1
      https://github.com/d3scomp/JDEECo/commit/9896437361ae3e0261e92b49892cb82885e4a6e1
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md


  Commit: ebe6b6b3dc1baa30e43916ab99845e100ec80815
      https://github.com/d3scomp/JDEECo/commit/ebe6b6b3dc1baa30e43916ab99845e100ec80815
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md


  Commit: 5cb898a7e83b5e25c5276c7c7656956c1fa60df0
      https://github.com/d3scomp/JDEECo/commit/5cb898a7e83b5e25c5276c7c7656956c1fa60df0
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-11 (Sat, 11 Jan 2014)

  Changed paths:
    M jdeeco-core/pom.xml

  Log Message:
  -----------
  Update pom.xml


  Commit: 81f9bb504ff7209ac186be1f927d48b66f109da4
      https://github.com/d3scomp/JDEECo/commit/81f9bb504ff7209ac186be1f927d48b66f109da4
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-17 (Fri, 17 Jan 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  README.md updated towards new jdeeco


  Commit: b8785ea8870277cb730669a7a47b0e9580639e20
      https://github.com/d3scomp/JDEECo/commit/b8785ea8870277cb730669a7a47b0e9580639e20
  Author: Andranik Muradyan <muradian at d3s.mff.cuni.cz>
  Date:   2014-01-17 (Fri, 17 Jan 2014)

  Changed paths:
    M jdeeco-core-osgi/pom.xml
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloud.java
    R jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherDynamicCloud.java
    R jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherDynamicCloudNoJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloud.java
    R jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloudNoJPF.java
    M jdeeco-parent/pom.xml

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

Conflicts:
	jdeeco-architecture/.project
	jdeeco-architecture/architecture-24.10.2013.emx
	jdeeco-core-osgi/pom.xml
	jdeeco-core/pom.xml
	jdeeco-parent/pom.xml


Compare: https://github.com/d3scomp/JDEECo/compare/54ac61442cb2...b8785ea88702