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 Bump consul-template to 0.35.0 into release/1.6.x #19045

Conversation

hc-github-team-nomad-core
Copy link
Contributor

Backport

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

🚨

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:
@tgross
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/nomad/merges: 409 Merge conflict []

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


Original PR had no description content.


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Nov 9, 2023

CLA assistant check
All committers have signed the CLA.

@tgross tgross force-pushed the backport/lkysow/consul-template-bump/singularly-chief-ringtail branch from 828773f to bd78b86 Compare November 9, 2023 14:53
@tgross tgross marked this pull request as ready for review November 9, 2023 14:54
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

LGTM. Will merge once CI is green.

@tgross tgross merged commit c4e8667 into release/1.6.x Nov 9, 2023
23 of 24 checks passed
@tgross tgross deleted the backport/lkysow/consul-template-bump/singularly-chief-ringtail branch November 9, 2023 15:30
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