Skip to content

Backport of Update submodules to latest following 1.16.0 into release/1.16.x#18198

Merged
zalimeni merged 1 commit into
release/1.16.xfrom
backport/zalimeni/fix-submodule-versions-latest/wrongly-crisp-stud
Jul 20, 2023
Merged

Backport of Update submodules to latest following 1.16.0 into release/1.16.x#18198
zalimeni merged 1 commit into
release/1.16.xfrom
backport/zalimeni/fix-submodule-versions-latest/wrongly-crisp-stud

Conversation

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

Backport

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

🚨

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:
@zalimeni
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.


Align all our internal use of submodules on the latest versions.

PR Checklist

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

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/fix-submodule-versions-latest/wrongly-crisp-stud branch from ec0072c to 2b07d81 Compare July 19, 2023 23:24
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/fix-submodule-versions-latest/wrongly-crisp-stud branch from 2b07d81 to ec0072c Compare July 19, 2023 23:24
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Jul 19, 2023

CLA assistant check
All committers have signed the CLA.

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

Align all our internal use of submodules on the latest versions.

Manual backport of 235d9c5.
@zalimeni zalimeni force-pushed the backport/zalimeni/fix-submodule-versions-latest/wrongly-crisp-stud branch from 13b77bb to b3191b4 Compare July 19, 2023 23:35
@zalimeni zalimeni marked this pull request as ready for review July 19, 2023 23:35
@zalimeni zalimeni enabled auto-merge (squash) July 19, 2023 23:35
@zalimeni zalimeni disabled auto-merge July 19, 2023 23:35
@zalimeni zalimeni enabled auto-merge (squash) July 19, 2023 23:35
@zalimeni zalimeni merged commit dc58b45 into release/1.16.x Jul 20, 2023
@zalimeni zalimeni deleted the backport/zalimeni/fix-submodule-versions-latest/wrongly-crisp-stud branch July 20, 2023 01:35
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