Merge pull request #1656 from kev009/target_set_add_meta

Added MetaDataSet to target_set

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index 4d4e0aa..d680564 100644 (file)
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -221,7 +221,7 @@
 
 Summary:       statistics collection and monitoring daemon
 Name:          collectd
-Version:       5.5.0
+Version:       5.5.1
 Release:       1%{?dist}
 URL:           http://collectd.org
 Source:                http://collectd.org/files/%{name}-%{version}.tar.bz2

diff --git a/src/disk.c b/src/disk.c
index 1dbdd9d..bafc82e 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -293,6 +293,7 @@ static void disk_submit (const char *plugin_instance,
        plugin_dispatch_values (&vl);
 } /* void disk_submit */
 
+#if KERNEL_FREEBSD || KERNEL_LINUX
 static void submit_io_time (char const *plugin_instance, derive_t io_time, derive_t weighted_time)
 {
        value_t values[2];
@@ -313,6 +314,7 @@ static void submit_io_time (char const *plugin_instance, derive_t io_time, deriv
 
        plugin_dispatch_values (&vl);
 } /* void submit_io_time */
+#endif /* KERNEL_FREEBSD || KERNEL_LINUX */
 
 #if KERNEL_LINUX
 static void submit_in_progress (char const *disk_name, gauge_t in_progress)