X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b2cba76f01c60f2dea5ff0b1cb0b30931f90748..b953989b8912a37ebf4b2dc526681bcef0562c5a:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 782c65fe90..67accfc2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,11 @@ 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