Merge remote-tracking branch 'origin/pr/651'

Conflicts:
	contrib/redhat/collectd.spec

diff --cc AUTHORS
Simple merge

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
index 20f6dd5f215e8554c808beae5da556423df9374b,ec03485922ab1f01e07b61c39061e40b49b69834..0950f23a4872142b6f3cbe47079da2fc430f588e
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -1982,9 -1955,12 +1992,12 @@@ f
  %if %{with_thermal}
  %{_libdir}/%{name}/thermal.so
  %endif
 -%if %{with_load}
 +%if %{with_threshold}
  %{_libdir}/%{name}/threshold.so
  %endif
+ %if %{with_turbostat}
+ %{_libdir}/%{name}/turbostat.so
+ %endif
  %if %{with_unixsock}
  %{_libdir}/%{name}/unixsock.so
  %endif
@@@ -2313,7 -2281,7 +2326,7 @@@
  %changelog
  # * TODO 5.5.0-1
  # - New upstream version
- # - New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart, openldap, redis, write_redis, zookeeper, write_log, write_sensu, ipc
 -# - New plugins enabled by default: drbd, log_logstash, write_tsdb, smart, openldap, redis, write_redis, zookeeper, write_log, turbostat
++# - New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart, openldap, redis, write_redis, zookeeper, write_log, write_sensu, ipc, turbostat
  # - New plugins disabled by default: barometer, write_kafka
  # - Enable zfs_arc, now supported on Linux
  # - Install disk plugin in a dedicated package, as it depends on libudev

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge