From 5560c122f820a8a5ecabc4c24a6e9fd444163910 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 17 Nov 2020 13:58:22 +0000 Subject: [container][latest] Rename and update barometer-collectd-latest Collectd changed the upstream default to main, and Barometer added a few changes to incorporate this. One change was renaming the `barometer-collectd-master` container to `barometer-collectd-latest`, since `barometer-collectd-main` didn't make sense semantically, as we use the stable container as the "main" reference. At the time, we didn't have the changes made in releng to build the new container, so container renaming was paused. Now that the change is merged in releng (and has been for a while), and the containers are being updated, this change should happen, so that the container gets published. Signed-off-by: Emma Foley Change-Id: I4ee91c289b9e7477157bea148452be58343dc733 --- src/package-list.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/package-list.mk') diff --git a/src/package-list.mk b/src/package-list.mk index ec64df14..59e9a0a2 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -22,7 +22,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd # there are 3 collectd flavors: # -"stable" - based on stable collectd release -# -"master" - development version, based on main branch +# -"latest" - development version, based on main branch # -"experimental" - it is based on main branch as above and includes # set pull requests with experimental features ifeq ($(COLLECTD_FLAVOR), stable) @@ -30,10 +30,10 @@ ifeq ($(COLLECTD_FLAVOR), stable) COLLECTD_TAG ?= collectd-5.12 SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs else -# 'master' and 'experimental' collectd flavors are both using +# 'latest' and 'experimental' collectd flavors are both using # code from main branch COLLECTD_TAG ?= main - SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master + SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest ifeq ($(COLLECTD_FLAVOR), experimental) # 'experimental' flavor is using additional Pull Requests that # are put on top of main release -- cgit 1.2.3-korg