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 Auto-rolling billing start docs PR into release/1.17.x #27994

Merged

Conversation

hc-github-team-secure-vault-core
Copy link
Contributor

Backport

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

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


Description

What does this PR do?
Docs changes for auto-roll billing start date
JIRA: https://hashicorp.atlassian.net/browse/VAULT-26332
RFC: https://docs.google.com/document/d/1p7s1J_3glPXnBeY-mM-U_pmeLyagYtgT5zgX_5BRrbM/edit?usp=sharing
Approved docs PR: #27685

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.

Overview of commits

Copy link

hashicorp-cla-app bot commented Aug 6, 2024

CLA assistant check
All committers have signed the 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 have already 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.

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

github-actions bot commented Aug 6, 2024

CI Results:
All Go tests succeeded! ✅

* auto-roll docs changes

* addressing comments

* address comments

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Sarah Chavis <[email protected]>

* addressing some changes

* update docs

* update docs with common explanation file

* updated note info

* fix 1.18 upgrade doc

* fix content-check error

* Update website/content/partials/auto-roll-billing-start-example.mdx

Co-authored-by: miagilepner <[email protected]>

---------

Co-authored-by: Sarah Chavis <[email protected]>
Co-authored-by: miagilepner <[email protected]>
@akshya96 akshya96 marked this pull request as ready for review August 6, 2024 16:55
@akshya96 akshya96 requested a review from a team as a code owner August 6, 2024 16:55
Copy link

github-actions bot commented Aug 6, 2024

Build Results:
All builds succeeded! ✅

@akshya96 akshya96 enabled auto-merge (squash) August 6, 2024 17:15
@schavis schavis added the docs label Aug 6, 2024
@akshya96 akshya96 removed their request for review August 7, 2024 16:33
@akshya96 akshya96 disabled auto-merge August 7, 2024 16:33
@akshya96 akshya96 merged commit 1e2e591 into release/1.17.x Aug 7, 2024
27 checks passed
@akshya96 akshya96 deleted the backport/vault-26332-ce-docs/early-brave-goblin branch August 7, 2024 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs 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.

4 participants