From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 18 Sep 2023 14:14:25 +0000 (+0000)
Subject: Merge branch 'task_dispatch' into 'master'
X-Git-Tag: v3.35~110
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c43701ee8c55961a18ea2b8e75aa18a8654ebf71?hp=-c

Merge branch 'task_dispatch' into 'master'

Task dispatch

See merge request simgrid/simgrid!170
---

c43701ee8c55961a18ea2b8e75aa18a8654ebf71
diff --combined MANIFEST.in
index e0c96c2bed,57876c43f0..ef8d95cb2f
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@@ -394,6 -394,10 +394,10 @@@ include examples/cpp/synchro-semaphore/
  include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.tesh
  include examples/cpp/task-io/s4u-task-io.cpp
  include examples/cpp/task-io/s4u-task-io.tesh
+ include examples/cpp/task-microservice/s4u-task-microservice.cpp
+ include examples/cpp/task-microservice/s4u-task-microservice.tesh
+ include examples/cpp/task-parallelism/s4u-task-parallelism.cpp
+ include examples/cpp/task-parallelism/s4u-task-parallelism.tesh
  include examples/cpp/task-simple/s4u-task-simple.cpp
  include examples/cpp/task-simple/s4u-task-simple.tesh
  include examples/cpp/task-storm/s4u-task-storm.cpp
@@@ -1805,6 -1809,7 +1809,6 @@@ include examples/README.rs
  include examples/c/CMakeLists.txt
  include examples/cpp/CMakeLists.txt
  include examples/platforms/CMakeLists.txt
 -include examples/platforms/battery_platform.xml
  include examples/platforms/bypassRoute.xml
  include examples/platforms/bypassZoneRoute.xml
  include examples/platforms/cloud.xml