Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into v3.20-expose-simgrid-jni
authorjed56 ( Jean-Emile DARTOIS) <jedartois@gmail.com>
Tue, 9 Oct 2018 13:32:02 +0000 (15:32 +0200)
committerJeD <jean-emile.dartois@b-com.com>
Thu, 11 Oct 2018 15:40:44 +0000 (17:40 +0200)
commit29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85
treee9120b5ba901af2e20fcd5c8a49aa420268b1d8f
parent9b9604890a31d41c3837bee248e8a77822d41ec7
parent4299696f4a0ac31e2758ee601f09c607ed42676a
Merge branch 'master' into v3.20-expose-simgrid-jni
13 files changed:
ChangeLog
examples/java/CMakeLists.txt
examples/java/hostload/LoadRunner.java
examples/java/hostload/hostload.tesh
include/simgrid/host.h
include/simgrid/msg.h
include/simgrid/plugins/load.h
src/bindings/java/jmsg.cpp
src/bindings/java/jmsg_host.cpp
src/bindings/java/org/simgrid/msg/Host.java
src/bindings/java/org/simgrid/msg/Msg.java
src/msg/msg_legacy.cpp
src/s4u/s4u_Host.cpp