From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 1 Mar 2017 09:45:37 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_15~263
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8a2f0e341903330158b58400086dde589e2178e9

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

8a2f0e341903330158b58400086dde589e2178e9
diff --cc tools/cmake/DefinePackages.cmake
index 81feb43200,81feb43200..4be1c2fabc
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -1077,6 -1077,6 +1077,7 @@@ set(PLATFORMS_EXAMPLE
    examples/platforms/data_center.xml
    examples/platforms/dogbone.xml
    examples/platforms/energy_platform.xml
++  examples/platforms/energy_cluster.xml
    examples/platforms/faulty_host.xml
    examples/platforms/g5k.xml
    examples/platforms/griffon.xml