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 docs: Fixes examples for alias_refresh_interval & dns_request_timeout into stable-website #5545

Conversation

hc-github-team-secure-boundary
Copy link
Collaborator

Backport

This PR is auto-generated from #5544 to be assessed for backporting due to the inclusion of the label backport/website.

🚨

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:
@johanbrandhorst
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/boundary/merges: 409 Merge conflict []

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


  • Issue: Client agent does not start if the given example configurations are used.
  • Both the parameters are parsed using parseutil.ParseDurationSecond, which parses a duration from a string or numeric value into a time.Duration.
  • When units are missing (such as when a numeric type is provided), the duration is assumed to be in seconds.
  • Since providing a time format is more readable, updating the example to the corrected string version.
  • Providing a string example configuration is more suitable than providing a number example like alias_refresh_interval=60; where it is automatically assumed to be seconds, and can become confusing for the consumers.

Overview of commits

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.

1 similar comment
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.

@johanbrandhorst
Copy link
Collaborator

CC @stellarsquall do we need to do this manually? I don't know about the status of the stable-website branch.

@stellarsquall
Copy link
Collaborator

hmm I think these should mere automatically after the tests finish running? usually it takes a bit. but the backport/website label is supposed to handle that

@moduli
Copy link
Collaborator

moduli commented Feb 13, 2025

@johanbrandhorst @stellarsquall According to the PR description, the auto-merge failed due to a detected merge conflict. We'll have to reapply the commit on this branch and address the conflict.

@johanbrandhorst
Copy link
Collaborator

I'll do a manual merge

@johanbrandhorst
Copy link
Collaborator

Superceded by #5547

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