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

Backport of update ubi image to 9.4 into release/1.5.x #603

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #602 to be assessed for backporting due to the inclusion of the label backport/1.5.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@dhiaayachi
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-dataplane/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


updating redhat ubi base image to 9.4


Overview of commits

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@dhiaayachi dhiaayachi marked this pull request as ready for review August 30, 2024 00:25
@dhiaayachi dhiaayachi requested a review from a team as a code owner August 30, 2024 00:25
@dhiaayachi dhiaayachi requested review from zalimeni and jmurret August 30, 2024 12:18
@dhiaayachi dhiaayachi enabled auto-merge (squash) August 30, 2024 12:37
@dhiaayachi dhiaayachi merged commit 088540b into release/1.5.x Aug 30, 2024
42 checks passed
@dhiaayachi dhiaayachi deleted the backport/dhiaayachi/ubi-image-update/cheaply-heroic-platypus branch August 30, 2024 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants