Merge branch 'master' into 'photovoltaic-revamp'

# Conflicts:
#   examples/cpp/CMakeLists.txt
#   tools/cmake/DefinePackages.cmake

diff --cc ChangeLog
Simple merge

diff --cc MANIFEST.in
Simple merge

diff --cc docs/source/Plugins.rst
index 003b81f,87ba3a8..683bb4f
--- 1/docs/source/Plugins.rst
--- 2/docs/source/Plugins.rst
+++ b/docs/source/Plugins.rst
@@@ -224,11 -224,16 +224,16 @@@ Batter
  
  .. doxygengroup:: plugin_battery
  
 -.. _plugin_photovoltaic:
 +.. _plugin_solar_panel:
  
 -Photovoltaic
 +Solar Panel
  ===========
  
 -.. doxygengroup:: plugin_photovoltaic
 +.. doxygengroup:: plugin_solar_panel
  
+ Chiller
+ ===========
+ 
+ .. doxygengroup:: plugin_chiller
+ 
  ..  LocalWords:  SimGrid

diff --cc examples/cpp/CMakeLists.txt
index 4907fdf,f46d58b..2ddf038
--- 1/examples/cpp/CMakeLists.txt
--- 2/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@@ -171,8 -172,8 +172,8 @@@ foreach (example activityset-testany ac
                   mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-bugged2-liveness mc-centralized-mutex mc-electric-fence mc-failing-assert
                   network-ns3 network-ns3-wifi network-wifi
                   io-async io-priority io-degradation io-file-system io-file-remote io-disk-raw io-dependent
-                  task-io task-simple task-variable-load task-storm task-switch-host
 -                 task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load
 -                 photovoltaic-simple
++                 task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load 
 +                 solar-panel-simple
                   platform-comm-serialize platform-failures platform-profile platform-properties
                   plugin-host-load plugin-jbod plugin-link-load plugin-prodcons
                   replay-comm replay-io

diff --cc tools/cmake/DefinePackages.cmake
index 267162f,59ef88e..cee3e25
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -453,7 -453,8 +453,8 @@@ set(PLUGINS_SR
    src/plugins/vm/VmLiveMigration.hpp
    src/plugins/vm/dirty_page_tracking.cpp
    src/plugins/battery.cpp
 -  src/plugins/photovoltaic.cpp
+   src/plugins/chiller.cpp
 +  src/plugins/solar_panel.cpp
    )