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 /docker/barometer-collectd-experimental | |
| 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 'docker/barometer-collectd-experimental')
| -rw-r--r-- | docker/barometer-collectd-experimental/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/barometer-collectd-experimental/collectd_apply_pull_request.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile index cf94df2f..49016d9b 100644 --- a/docker/barometer-collectd-experimental/Dockerfile +++ b/docker/barometer-collectd-experimental/Dockerfile @@ -31,7 +31,7 @@ COPY . ${repos_dir}/barometer COPY docker/barometer-collectd-experimental/collectd_apply_pull_request.sh \ ${repos_dir}/barometer/src/collectd/ -# copying additional experimental configs on top of configs for 'master' +# copying additional experimental configs on top of configs for 'main' # branch release COPY docker/barometer-collectd-experimental/experimental-configs/* \ ${repos_dir}/barometer/src/collectd/collectd_sample_configs-master/ diff --git a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh index 831aba37..45a2a2cd 100755 --- a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh +++ b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh @@ -15,7 +15,7 @@ # # This files contains list of pull requests to be applied on top -# of master branch before building collectd included in docker +# of main branch before building collectd included in docker # collectd-experimental container # Space/newline separated list of pull requests IDs |