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 OSS -> CE into release/1.16.x #18546

Conversation

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

Backport

This PR is auto-generated from #18517 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:
@analogue
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

See NET-5353 for acceptance criteria.

Most of the changes fall into two buckets:

  • filename change only: variations of *_oss_*.go -> _ce_*.go
  • additional file content changes: code and comment variations of OSS -> CE

Things I chose to skip are annotated with TODO(spatel): CE refactor because I'm not sure of the implications of the change and what it may break. These will be revisited as time permits.

Testing & Reproduction steps

All checks have passed.

PR Checklist

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

Tagging team leads as primary reviewers for visibility and due to the extent of the changes.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/spatel/oss_to_ce/highly-moral-spider branch from 985b2f5 to addced4 Compare August 22, 2023 15:34
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/spatel/oss_to_ce/highly-moral-spider branch from addced4 to 985b2f5 Compare August 22, 2023 15:34
@hashicorp-cla
Copy link

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 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.

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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging August 22, 2023 15:37 Inactive
@vercel vercel bot temporarily deployed to Preview – consul August 22, 2023 15:40 Inactive
@analogue
Copy link
Collaborator

Closing. Manual backport in #18549

@analogue analogue closed this Aug 23, 2023
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