Merge branch 'klement/simgrid-klement' into master

diff --cc ChangeLog
index a2e17e2,5543b35..f1cf894
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -21,11 -21,16 +21,16 @@@ Important user-visible changes
     src/dest, and communicator information). This may change simulation times
     for very small message sizes, but should be more realistic.
  
+ Documentation:
+  - New examples: wifi networks, and communication suspend
+ 
  S4U:
   - the on_exit() of each actor is also executed when the simulation deadlocks.
+  - New functions: s4u::Activity:: suspend(), resume() and is_suspended()
+    An example is provided for s4u::Comm but it should work with Exec and Io.
  
  SMPI:
 - - Update proxy apps coverage of new ECP apps: 60+ apps now tested nightly on 
 + - Update proxy apps coverage of new ECP apps: 60+ apps now tested nightly on
     https://framagit.org/simgrid/SMPI-proxy-apps
   - MPI/IO: supports names starting with "./"
   - Fortran: many MPI/IO bindings, support for MPI_UB/LB, C MPI_INT/FLOAT/DOUBLE
@@@ -69,9 -70,9 +75,10 @@@ Fixed bugs (FG#.. -> FramaGit bugs; FG!
   - GH#128: Parallelization of simulation with --cfg=contexts/nthreads
   - GH#139: Allow pthread creation in SMPI
   - GH#336: Packet-level simulation using SMPI?
 + - GH#346: [SMPI] error while loading shared libraries: libsimgrid.so
   - GH!337: Fix link_energy plugin for wifi platforms
   - GH!339: Add Mailbox set_receiver method to python binding
+  - GH!344: Cast hugepages macros parameters to int64
  
  ----------------------------------------------------------------------------
  

diff --cc MANIFEST.in
Simple merge

diff --cc tools/cmake/DefinePackages.cmake
Simple merge