Skip to content

[7.14](backport #26860) [automation] Update go release version 1.16.6#26906

Merged
urso merged 2 commits into7.14from
mergify/bp/7.14/pr-26860
Jul 16, 2021
Merged

[7.14](backport #26860) [automation] Update go release version 1.16.6#26906
urso merged 2 commits into7.14from
mergify/bp/7.14/pr-26860

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 15, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #26860 done by Mergify.
Cherry-pick of 240ee56 has failed:

On branch mergify/bp/7.14/pr-26860
Your branch is up to date with 'origin/7.14'.

You are currently cherry-picking commit 240ee56f3.
  (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:   auditbeat/Dockerfile
	modified:   filebeat/Dockerfile
	modified:   heartbeat/Dockerfile
	modified:   journalbeat/Dockerfile
	modified:   libbeat/Dockerfile
	modified:   metricbeat/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://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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/

[automation] Update go release version 1.16.6 (#26860)
9685439 
Co-authored-by: apmmachine <infra-root-apmmachine@elastic.co>
(cherry picked from commit 240ee56)

# Conflicts:
#	libbeat/docs/version.asciidoc
@mergify mergify bot requested a review from a team as a code owner July 15, 2021 10:30
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 15, 2021
@mergify mergify bot assigned ghost Jul 15, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 15, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Jul 15, 2021

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 15, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-15T11:17:23.163+0000

  • Duration: 142 min 3 sec

  • Commit: c9a6819

Test stats 🧪

Test Results
Failed 0
Passed 48030
Skipped 5291
Total 53321

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 48030
Skipped 5291
Total 53321

Update version.asciidoc
c9a6819 
fix merge conflict
@urso urso merged commit 012fc60 into 7.14 Jul 16, 2021
@urso urso deleted the mergify/bp/7.14/pr-26860 branch July 16, 2021 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

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.

2 participants

@elasticmachine @urso