Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 2, 2025

Exhaustive test suite: https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/2405/steps/canvas


This is an automatic backport of pull request #18083 done by Mergify.

(cherry picked from commit 398a66c)

# Conflicts:
#	docker/templates/Dockerfile.erb
@mergify mergify bot added backport conflicts Detected git conflicts labels Sep 2, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Sep 2, 2025

Cherry-pick of 398a66c has failed:

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

You are currently cherry-picking commit 398a66cb.
  (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:   docker/templates/IronbankDockerfile.erb

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docker/templates/Dockerfile.erb

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

@mergify mergify bot assigned jsvd Sep 2, 2025
@mergify mergify bot added the conflicts Detected git conflicts label Sep 2, 2025
@mergify mergify bot mentioned this pull request Sep 2, 2025
Removed obsolete image flavor condition for observability-sre.
@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @jsvd

@jsvd jsvd merged commit 3e95cd7 into 9.0 Sep 2, 2025
12 checks passed
@jsvd jsvd deleted the mergify/bp/9.0/pr-18083 branch September 2, 2025 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts Detected git conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants