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

Fix CE drift #27697

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Fix CE drift #27697

merged 1 commit into from
Jul 4, 2024

Conversation

VioletHynes
Copy link
Contributor

@VioletHynes VioletHynes commented Jul 4, 2024

Description

Benchhelpers got deleted on ent but not CE, since the script I use to move over changes between the two doesn't capture deleted files

TODO only if you're a HashiCorp employee

  • Labels: If this PR is the CE portion of an ENT change, and that ENT change is
    getting backported to N-2, use the new style backport/ent/x.x.x+ent labels
    instead of the old style backport/x.x.x labels.
  • Labels: If this PR is a CE only change, it can only be backported to N, so use
    the normal backport/x.x.x label (there should be only 1).
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 4, 2024
Copy link
Contributor

@stevendpclark stevendpclark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@VioletHynes VioletHynes enabled auto-merge (squash) July 4, 2024 18:29
Copy link

github-actions bot commented Jul 4, 2024

Build Results:
All builds succeeded! ✅

Copy link

github-actions bot commented Jul 4, 2024

CI Results:
All Go tests succeeded! ✅

@VioletHynes VioletHynes merged commit f55cc0b into main Jul 4, 2024
94 checks passed
@VioletHynes VioletHynes deleted the violethynes/fix-CE-drift-2024-07-04 branch July 4, 2024 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants