Merge branch 'master' into 'master'

plugin link_load: fix name in SIMGRID_REGISTER_PLUGIN

See merge request simgrid/simgrid!43

diff --git a/src/plugins/link_load.cpp b/src/plugins/link_load.cpp
index 95d80c8..d25079e 100644 (file)
--- a/src/plugins/link_load.cpp
+++ b/src/plugins/link_load.cpp
@@ -12,7 +12,7 @@
 
 #include <limits>
 
-SIMGRID_REGISTER_PLUGIN(link_energy, "Link cumulated load.", &sg_link_load_plugin_init)
+SIMGRID_REGISTER_PLUGIN(link_load, "Link cumulated load.", &sg_link_load_plugin_init)
 
 /** @defgroup plugin_link_load Plugin Link Cumulated Load