diff options
| author |   Emma Foley <efoley@redhat.com> | 2020-06-29 22:11:03 +0100 |
|---|---|---|
| committer | Emma Foley <efoley@redhat.com> | 2020-06-30 16:36:30 +0100 |
| commit | 320257e17b3a03915ed781fe955e39e1f5255591 (patch) | |
| tree | 02cc5ef5a73cab371f6964cbadce29fcba2d2fa5 /src/package-list.mk | |
| parent | f6bad3ff064f7277f5575b9e7d2a0bfb0c4bb85e (diff) | |
Update collectd tags to use main instead of master
The branch names have been updated, and main has replaced
master, which will no longer be updated.
Change-Id: Idfce21554594f15a831c8b7ec769eb85d52068b1
Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'src/package-list.mk')
| -rw-r--r-- | src/package-list.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/package-list.mk b/src/package-list.mk index 34e404c1..dce32cfb 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -22,8 +22,8 @@ COLLECTD_URL ?= https://github.com/collectd/collectd # there are 3 collectd flavors: # -"stable" - based on stable collectd release -# -"master" - development version, based on master branch -# -"experimental" - it is based on master branch as above and includes +# -"master" - 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) # using latest stable release @@ -31,12 +31,12 @@ ifeq ($(COLLECTD_FLAVOR), stable) SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs else # 'master' and 'experimental' collectd flavors are both using -# code from master branch - COLLECTD_TAG ?= master +# code from main branch + COLLECTD_TAG ?= main SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master ifeq ($(COLLECTD_FLAVOR), experimental) # 'experimental' flavor is using additional Pull Requests that -# are put on top of master release +# are put on top of main release COLLECTD_USE_EXPERIMENTAL_PR ?= y endif #end of experimental-branch handling endif |