inline two C files that were included (gosh)

[simgrid.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3fe5f93..def6922 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 SimGrid (3.22) NOT RELEASED (Release Target: December 21. 2018, 22:23 UTC)
 
+Java:
+ - Expose host load plugin: loadInit, getCurrentLoad, getComputedFlops, getAvgLoad
+
+Fixed bugs:
+ - #261: Document the parameters of parallel execution's constructor
+
+----------------------------------------------------------------------------
+
 SimGrid (3.21) October 3. 2018
 
 The Restarting Documentation (TRD) Release.