Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into 'rework-energy-plugin'
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Fri, 27 Sep 2019 22:01:57 +0000 (00:01 +0200)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Fri, 27 Sep 2019 22:01:57 +0000 (00:01 +0200)
commit79f4c4c467150b3bea841b968cabd629e9d9282a
treeeefeac3cf87d559b8f3a489250ee1f12821b843d
parent1062a562502ee5cd09a6577400df729eb60a70c5
parent05fa4346bbe0aa0593bc8c4cbb4ed165628abc54
Merge branch 'master' into 'rework-energy-plugin'

# Conflicts:
#   include/simgrid/plugins/energy.h
MANIFEST.in
examples/s4u/CMakeLists.txt
include/simgrid/plugins/energy.h
src/plugins/host_energy.cpp