Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into hypervisor
authorPaul Bédaride <paul.bedaride@gmail.com>
Wed, 19 Jun 2013 11:42:14 +0000 (13:42 +0200)
committerPaul Bédaride <paul.bedaride@gmail.com>
Wed, 19 Jun 2013 11:42:14 +0000 (13:42 +0200)
commit12c0f182635ed71b370d608b5b9a614153765cd4
tree855da8ab2cddcaaabaf21daeccfbce7ad2c2c449
parent054ee8581cc1b4c22fcf66c5b3f0c6e7267a3e65
parent936a14d7a4de6b0ab971a416d16a2b7099fc5cc1
Merge branch 'master' into hypervisor

Conflicts:
src/bindings/java/jmsg_synchro.c
src/bindings/java/org/simgrid/msg/Host.java
src/include/surf/surf.h
src/smpi/colls/allgather-RDB.c
src/smpi/colls/allgather-SMP-simple.c
src/surf/cpu_cas01.c
src/surf/surf.c
src/surf/surf_routing.c
src/surf/workstation.c
24 files changed:
buildtools/Cmake/DefinePackages.cmake
include/msg/datatypes.h
include/msg/msg.h
include/simgrid/platf.h
include/simgrid/simix.h
src/bindings/java/org/simgrid/msg/Host.java
src/include/surf/surf.h
src/msg/msg_host.c
src/msg/msg_process.c
src/simgrid/sg_config.c
src/simix/smx_global.c
src/simix/smx_host.c
src/simix/smx_host_private.h
src/simix/smx_io.c
src/simix/smx_network.c
src/simix/smx_smurf_private.h
src/simix/smx_synchro.c
src/simix/smx_user.c
src/surf/cpu_cas01.c
src/surf/network.c
src/surf/new_model.c
src/surf/storage.c
src/surf/surf.c
src/surf/workstation.c