From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 13 May 2012 21:22:15 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_7~11
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0766ec711b34875972c4ece311c4e1c472f25d5f?hp=-c

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

0766ec711b34875972c4ece311c4e1c472f25d5f
diff --combined ChangeLog
index 51b18db63d,3fbc1e397b..5113bc9b11
--- a/ChangeLog
+++ b/ChangeLog
@@@ -87,6 -87,9 +87,9 @@@ SimGrid (3.7) NOT RELEASED; urgency=lo
    * Trace header updated according to the latest Paje file format
    * Tracing network lazy updates, no longer obligate users to use full updates
    * --cfg=tracing/platform:1 also registers power/bandwidth variables
+   * Experimental: let user code declare/set/push/pop application states for hosts
+   * API changed to allow the manual creation of graph configuration files
+     for Triva. See TRACE_get_node_types() and TRACE_get_edge_types().
  
    Lua:
    * Improve the API of Lua MSG bindings, using the Lua spirit.
@@@ -115,9 -118,6 +118,9 @@@
        you have less than 2 million elements in your dynar and don't
        want of the extra complexity of catching exceptions when the
        element is not found.
 +  * Portability layer
 +    - Make xbt_os_thread module (for thread portability) public.
 +      Documentation is still to come, sorry.
    * mmalloc module:
      - Cleanups and simplifications to make it maintainable again.
      - Exotic features (such as memalign and valloc) were removed.