X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1a5484101efbff9c8d982a0c4650f7953ee7e2f..42512083de42e8878084418d19303186bdc0906a:/ChangeLog?ds=sidebyside

diff --git a/ChangeLog b/ChangeLog
index 002aa947a4..fee4399bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,12 +2,20 @@
 
 SimGrid (3.27.1) NOT RELEASED YET (v3.28 expected June 21. 2021, 03:32 UTC)
 
+S4U:
+ - Fixed a bug where Activity::wait_for() killed the activity on timeout.
+   Explicitly cancel the activity to get back to previous behavior.
+
 LUA:
  - Lua platform files are deprecated. Their support will be dropped after v3.31.
 
 XBT:
  - xbt_assert is not disabled anymore, even when built with enable_debug=off.
 
+Fixed bugs (FG#.. -> FramaGit bugs; FG!.. -> FG merge requests)
+ (FG: issues on Framagit; GF: issues on GForge; GH: issues on GitHub)
+ - FG#47: Complete and fix tests from teshuite/s4u/activity-lifecycle
+
 ----------------------------------------------------------------------------
 
 SimGrid (3.27) March 29. 2021