From 723c03ed8765cdda39cf67c76c0110198c01abe4 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 12 Nov 2016 18:51:45 +0100
Subject: [PATCH] document my last changes

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0970f49de4..2d508846e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@ SimGrid (3.14) UNRELEASED; urgency=low
  * smpi/cpu-threshold:-1 should become smpi/simulate-computation:no
    smpi/running-power    is renamed to smpi/host-speed
 
+ New functions and features
+ * MSG_parallel_task_execute_with_timeout, to timeout computations.
+
  Dropped / renamed functions and features
  * msg_mailbox_t and associated functions. Use s4u::Mailbox instead.
    - MSG_mailbox_is_empty() -> Mailbox::empty()
-- 
2.20.1