From a062652b6f047c6de4632fb1468a98c2af3e3844 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 1 Oct 2017 23:57:10 +0200
Subject: [PATCH 1/1] update changelog

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 7e2610f39a..ccdd6eca46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@ SimGrid (3.17) UNRELEASED (release target: September 22 2017)
    - #195: All actors have PID=0 in the logs
    - #204: Sometimes segfault with thread contexts and mmap privatization
    - #222: Actor::kill() doesn't really kill and segfaults 
+   - #225: Actor::kill() doesn't really kill when victims are doing a join()
 
 SimGrid (3.16) Released June 22. 2017.
 
-- 
2.20.1