X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b704ed9fe0479a5b422eb7123f949ede6eb7e27..65d254e9d714c57c4248975e8ed9b8730bd043b6:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index fd3a5ba30e..67accfc2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,10 +22,18 @@ S4U:
  - New functions: Comm::sendto_{init,async} to initiate a communication
    on between two (possibly remote) hosts.
 
+XBT:
+ - Drop simgrid::xbt::demangle. Please use boost::core::demangle instead.
+
 Documentation:
  - New section: Configuring the logs from the command line.
  - New section: Programming API of logs.
 
+Fixed bugs (FG#.. -> FramaGit bugs; FG!.. -> FG merge requests)
+ (FG: issues on Framagit; GF: issues on GForge; GH: issues on GitHub)
+- FG#37: Parallel tasks are limited to 1 core per host
+- GH#343: Wrong consumed energy when an exec timeouts
+
 ----------------------------------------------------------------------------
 
 SimGrid (3.26) December 15. 2020
@@ -192,7 +200,7 @@ SMPI:
    allocations' size above which they are considered "shared" by default (as if
    they were performed through SMPI_SHARED_MALLOC macros).
    Default = 0 = disabled feature.
-   Note : malloc, calloc and free are now overriden by smpicc/cxx by default.
+   Note : malloc, calloc and free are now overridden by smpicc/cxx by default.
    This can cause some troubles if codes are already overriding these. If this
    is the case, defining SMPI_NO_OVERRIDE_MALLOC in the compilation flags can
    help, but will make this feature unusable.