X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc646b32904fce0465f564d149a830c8e7aeffe4..e9198879b07a40f01d00fc80eed78cebb328a2bd:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3e1a6ae271..67accfc2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@ Documentation:
 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
 
 ----------------------------------------------------------------------------