From: Fred Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 20 Jun 2023 12:00:03 +0000 (+0000)
Subject: Merge branch 'master' into 'task-token'
X-Git-Tag: v3.34~14^2~7^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/da64c6383731d10c6174f81b4b6a20ff0ea186ae

Merge branch 'master' into 'task-token'

# Conflicts:
#   docs/source/Installing_SimGrid.rst
#   examples/cpp/mc-bugged2/s4u-mc-bugged2.tesh
#   teshsuite/smpi/coll-allreduce-with-leaks/mc-coll-allreduce-with-leaks.tesh
---

da64c6383731d10c6174f81b4b6a20ff0ea186ae