Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main](backport #42054) Beats standalone docker image will not start without -e option #42057

Merged
merged 3 commits into from
Dec 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024


This is an automatic backport of pull request #42054 done by [Mergify](https://mergify.com).

(cherry picked from commit 4e2d474)

# Conflicts:
#	CHANGELOG.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 16, 2024
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of 4e2d474 has failed:

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

You are currently cherry-picking commit 4e2d474d1.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 16, 2024
@botelastic
Copy link

botelastic bot commented Dec 16, 2024

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

Copy link
Contributor Author

mergify bot commented Dec 16, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 16, 2024
@jlind23 jlind23 enabled auto-merge (squash) December 16, 2024 15:40
@jlind23 jlind23 requested a review from kilfoyle December 16, 2024 15:41
Copy link
Contributor

@kilfoyle kilfoyle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 🚀

@jlind23 jlind23 merged commit e07b5c9 into main Dec 16, 2024
10 checks passed
@jlind23 jlind23 deleted the mergify/bp/main/pr-42054 branch December 16, 2024 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport backport-8.x Automated backport to the 8.x branch with mergify conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants