diff options
| author |   Matthias Runge <mrunge@redhat.com> | 2019-11-11 08:29:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-11-11 08:29:07 +0000 |
| commit | aafdc6832a83408256a9ca3c29e164535e2c59ac (patch) | |
| tree | 6ec0e87fac18e1e84fc48a7c605ee7dfec4295c7 | |
| parent | 26bfa43c4a932fa0c00799093720ea588609b160 (diff) | |
| parent | 1ee1bfce772b769508bca634b1ccfb914a8d0009 (diff) | |
Merge "Moving the collectd version from 5.8 to 5.10"
| -rwxr-xr-x | ci/utility/package-list.sh | 2 | ||||
| -rw-r--r-- | docker/barometer-influxdb/Dockerfile | 2 | ||||
| -rw-r--r-- | src/package-list.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh index 0ca4aea6..cb46c7b1 100755 --- 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 2989f631..3d761eb5 100644 --- 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 47b90bde..d5fedf73 100644 --- 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 |