From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Wed, 21 Nov 2018 10:48:16 +0000 (+0100)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid
X-Git-Tag: v3_22~796
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8d7ea40ec3f59b852b27ccb5ed9f75ab8ed6ffa0?hp=615f07c63982de3e1e9ae73b61964efa6825694d

Merge branch 'master' of framagit.org:simgrid/simgrid
---

diff --git a/ChangeLog b/ChangeLog
index 744c837fa4..9ecffb07e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,9 @@ MSG:
 
 Fixed bugs:
  - #261: Document the parameters of parallel execution's constructor
-
+ - #314: SMPI args internal cleanup
+ - #316: Fix a bug related to the CPU utilization of multi-core VM
+ 
 ----------------------------------------------------------------------------
 
 SimGrid (3.21) October 3. 2018