Merge "Moving the collectd version from 5.8 to 5.10"

diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh
index 0ca4aea..cb46c7b 100755 (executable)
--- a/ci/utility/package-list.sh
+++ b/ci/utility/package-list.sh
@@ -24,4 +24,4 @@ CMTCAT_BRANCH=8b27ad757e86a01bc51eafcb9e600605ff1beca4
 CMTCAT_VERSION="v1.1.0"
 
 COLLECTD_REPO=https://github.com/collectd/collectd.git
-COLLECTD_BRANCH=collectd-5.8
+COLLECTD_BRANCH=collectd-5.10

diff --git a/docker/barometer-influxdb/Dockerfile b/docker/barometer-influxdb/Dockerfile
index 2989f63..3d761eb 100644 (file)
--- a/docker/barometer-influxdb/Dockerfile
+++ b/docker/barometer-influxdb/Dockerfile
@@ -1,4 +1,4 @@
 FROM influxdb:1.3.7
 
-RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.8/src/types.db -O /types.db
+RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.10/src/types.db -O /types.db
 COPY ./influxdb.conf /etc/influxdb/influxdb.conf

diff --git a/src/package-list.mk b/src/package-list.mk
index 47b90bd..d5fedf7 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -27,7 +27,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd
 #                   set pull requests with experimental features
 ifeq ($(COLLECTD_FLAVOR), stable)
 # using latest stable release
-       COLLECTD_TAG ?= collectd-5.8
+       COLLECTD_TAG ?= collectd-5.10
        SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
 else
 # 'master' and 'experimental' collectd flavors are both using