X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fpackage-list.mk;fp=src%2Fpackage-list.mk;h=dce32cfb8df0a25c3f705aef700fdfb59bee1a00;hb=320257e17b3a03915ed781fe955e39e1f5255591;hp=34e404c105a1e8fb130f7c47c6d954f4e52d1ad2;hpb=f6bad3ff064f7277f5575b9e7d2a0bfb0c4bb85e;p=barometer.git 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