From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 10 Sep 2015 08:52:16 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_12~264
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/68df419b94f90deec6780ef4a9e32c19367ff5b9?hp=705a594f8781bc7eccadb7adecd884476351f4b8

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/ChangeLog b/ChangeLog
index 890a01056d..7a3c19a961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,7 @@ SimGrid (3.12) NOT RELEASED; urgency=low
    - Sanitize the interface in MSG_task_ module:
      - Merge two functions that were close enough but misleading:
        set_compute_duration(t)      -> set_flops_amount(t)
-       get_remaining_computation(t) -> set_flops_amount(t)
+       get_remaining_computation(t) -> get_flops_amount(t)
      - set_data_size(t) -> set_bytes_amount(t)
        get_data_size(t) -> get_bytes_amount(t)
    - Massive cleanups in the functions related to the energy