Skip to content

Backport of upgraded consul/api submodule to v1.31.2 into release/1.20.x#22175

Closed
hc-github-team-consul-core wants to merge 2 commits into
release/1.20.xfrom
backport/nitin/api-submodule-upgrade/specially-up-moth
Closed

Backport of upgraded consul/api submodule to v1.31.2 into release/1.20.x#22175
hc-github-team-consul-core wants to merge 2 commits into
release/1.20.xfrom
backport/nitin/api-submodule-upgrade/specially-up-moth

Conversation

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

Backport

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

🚨

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:
@nitin-sachdev-29
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/merges: 409 Merge conflict []

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


Description

upgraded consul/api submodule to 1.31.2

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app Bot commented Feb 18, 2025

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.

  • nitin-sachdev-29
  • 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.

@hashicorp-cla-app
Copy link
Copy Markdown

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


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
Copy Markdown
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

* upgraded consul/api submodule to v1.31.2

* added changelog

(cherry picked from commit 5f48cae)
@nitin-sachdev-29
Copy link
Copy Markdown
Contributor

created backport PR manually

@nitin-sachdev-29 nitin-sachdev-29 deleted the backport/nitin/api-submodule-upgrade/specially-up-moth branch February 18, 2025 18:27
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.

3 participants