Skip to content

[7.16](backport #28621) Update runc and containerd#28693

Merged
jsoriano merged 2 commits into7.16from
mergify/bp/7.16/pr-28621
Oct 28, 2021
Merged

[7.16](backport #28621) Update runc and containerd#28693
jsoriano merged 2 commits into7.16from
mergify/bp/7.16/pr-28621

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 28, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #28621 done by Mergify.
Cherry-pick of 97818c3 has failed:

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

You are currently cherry-picking commit 97818c3c26.
  (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:   x-pack/dockerlogbeat/magefile.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

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/

@jsoriano
Update containerd (#28621)
0c7b2d4 
Solve some dependabot warnings (the issues are starting containers
and pulling images, something beats don't do).
Removes a dependency on runc in dockerlogbeat build scripts.

(cherry picked from commit 97818c3)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 28, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 28, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Oct 28, 2021

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 28, 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-10-28T10:12:18.176+0000

  • Duration: 212 min 39 sec

  • Commit: bcec821

Test stats 🧪

Test Results
Failed 0
Passed 54632
Skipped 5307
Total 59939

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@jsoriano jsoriano merged commit 79e45d6 into 7.16 Oct 28, 2021
@jsoriano jsoriano deleted the mergify/bp/7.16/pr-28621 branch October 28, 2021 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jsoriano jsoriano

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 @jsoriano