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 Updated consul-template version into release/1.16.x #26865

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #26863 to be assessed for backporting due to the inclusion of the label backport/1.16.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:
@divyaac
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/vault/merges: 409 Merge conflict []

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


Thought about it, and didn't add a changelog because technically the change was in consul-template, not in Vault? There's a changelog there to reflect that.

If you think it's necessary, I can add a changelog here as well.


Overview of commits

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label May 7, 2024
Copy link

hashicorp-cla-app bot commented May 7, 2024

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • divyaac
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link

github-actions bot commented May 7, 2024

CI Results: failed ❌

@divyaac divyaac marked this pull request as ready for review May 7, 2024 18:22
@divyaac divyaac added this to the 1.16.3 milestone May 7, 2024
@divyaac divyaac enabled auto-merge (squash) May 7, 2024 18:26
@divyaac divyaac disabled auto-merge May 7, 2024 18:36
Copy link

github-actions bot commented May 7, 2024

Build Results:
Build failed for these jobs: artifacts:failure. Please refer to this workflow to learn more: https://github.com/hashicorp/vault/actions/runs/9709654438

@schavis schavis added the vault-update Used by SPE team to filter out PRs not related to content label May 8, 2024
@anwittin anwittin modified the milestones: 1.16.3, 1.16.4 May 28, 2024
@mladlow mladlow modified the milestones: 1.16.4, 1.16.5 Jun 7, 2024
@mladlow
Copy link
Collaborator

mladlow commented Jun 7, 2024

@divyaac could you please manually backport this PR? Failing the CLA check means that the auto backport was not successful.

@divyaac divyaac force-pushed the backport/Update_Consul_Template_Version/forcibly-evolved-walleye branch from d2937ad to ca5eaea Compare June 25, 2024 03:14
@divyaac divyaac force-pushed the backport/Update_Consul_Template_Version/forcibly-evolved-walleye branch from ca5eaea to 0b92030 Compare June 25, 2024 03:42
@tomcf-hcp tomcf-hcp modified the milestones: 1.16.5, 1.16.6 Jun 27, 2024
@divyaac divyaac enabled auto-merge (squash) June 28, 2024 08:16
@divyaac
Copy link
Contributor

divyaac commented Jul 2, 2024

Closing this because we no longer backport to CE this far along.

@divyaac divyaac closed this Jul 2, 2024
auto-merge was automatically disabled July 2, 2024 04:57

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed vault-update Used by SPE team to filter out PRs not related to content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants