Skip to content

[7.x](backport #26186) Update go version to 1.16.5#26295

Merged
ChrsMark merged 2 commits into7.xfrom
mergify/bp/7.x/pr-26186
Jun 15, 2021
Merged

[7.x](backport #26186) Update go version to 1.16.5#26295
ChrsMark merged 2 commits into7.xfrom
mergify/bp/7.x/pr-26186

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 14, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #26186 done by Mergify.
Cherry-pick of 881c512 has failed:

On branch mergify/bp/7.x/pr-26186
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 881c51231.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .go-version
	modified:   CHANGELOG-developer.next.asciidoc
	modified:   auditbeat/Dockerfile
	modified:   filebeat/Dockerfile
	modified:   generator/common/Makefile
	modified:   heartbeat/Dockerfile
	modified:   journalbeat/Dockerfile
	modified:   libbeat/Dockerfile
	modified:   metricbeat/Dockerfile
	modified:   metricbeat/module/http/_meta/Dockerfile
	modified:   packetbeat/Dockerfile
	modified:   x-pack/elastic-agent/Dockerfile
	modified:   x-pack/functionbeat/Dockerfile
	modified:   x-pack/libbeat/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/docs/version.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@michel-laterman
Update go version to 1.16.5 (#26186)
78b1fe8 
(cherry picked from commit 881c512)

# Conflicts:
#	libbeat/docs/version.asciidoc
@mergify mergify bot requested a review from a team as a code owner June 14, 2021 16:18
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 14, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 14, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Jun 14, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 14, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: michel-laterman commented: /test

  • Start Time: 2021-06-14T23:36:43.305+0000

  • Duration: 80 min 44 sec

  • Commit: ba5b526

Test stats 🧪

Test Results
Failed 0
Passed 1611
Skipped 421
Total 2032

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1611
Skipped 421
Total 2032

@michel-laterman
Copy link
Copy Markdown
Contributor

michel-laterman commented Jun 14, 2021

/test

@ChrsMark
Copy link
Copy Markdown
Member

ChrsMark commented Jun 15, 2021

Merging this one so as to try with a new build.

@ChrsMark ChrsMark merged commit 29d3ebc into 7.x Jun 15, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-26186 branch June 15, 2021 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@michel-laterman michel-laterman

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @michel-laterman @ChrsMark