Skip to content

Backport of Bumping go-discover to the lastest version into release/1.0.x#2393

Closed
hc-github-team-consul-core wants to merge 2 commits intorelease/1.0.xfrom
backport/eastebry/updating-go-discover-version/especially-superb-mako
Closed

Backport of Bumping go-discover to the lastest version into release/1.0.x#2393
hc-github-team-consul-core wants to merge 2 commits intorelease/1.0.xfrom
backport/eastebry/updating-go-discover-version/especially-superb-mako

Conversation

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

Backport

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

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


Changes proposed in this PR:

How I've tested this PR:

  • make control-plane-dev-docker

How I expect reviewers to test this PR:

  • Just verify the the container is building properly in CI.
  • I'm unsure if there are breaking changes in go-discover, since it doesn't use semver.

Checklist:

  • Tests added
  • CHANGELOG entry added (I'm not super sure what to do here, but let me know what changes I need to make)

Overview of commits

@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Jun 19, 2023

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.

  • eastebry
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have 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.

* Bumping go-discover to the lastest version
@curtbushko curtbushko marked this pull request as ready for review June 19, 2023 15:30
@curtbushko curtbushko enabled auto-merge (squash) June 19, 2023 20:00
@curtbushko curtbushko closed this Jun 19, 2023
auto-merge was automatically disabled June 19, 2023 20:01

Pull request was closed

@curtbushko curtbushko reopened this Jun 19, 2023
@curtbushko
Copy link
Copy Markdown
Contributor

Backport failed because of License CLA with temp user. Created a manual backport.

@curtbushko curtbushko closed this Jun 19, 2023
@curtbushko curtbushko deleted the backport/eastebry/updating-go-discover-version/especially-superb-mako branch January 9, 2024 15:33
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