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 Bumping go-discover to the lastest version into release/1.2.x #2395

Conversation

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

Backport

This PR is auto-generated from #2390 to be assessed for backporting due to the inclusion of the label backport/1.2.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

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/eastebry/updating-go-discover-version/secretly-fun-anemone branch 2 times, most recently from eab0b00 to 743d4de Compare June 19, 2023 13:43
@curtbushko curtbushko marked this pull request as ready for review June 19, 2023 14:45
@curtbushko curtbushko merged commit b878810 into release/1.2.x Jun 19, 2023
@curtbushko curtbushko deleted the backport/eastebry/updating-go-discover-version/secretly-fun-anemone branch June 19, 2023 15:49
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