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 replaced ordered list of rate limit ops with flow diagram into release/1.16.x #18405

Conversation

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

Backport

This PR is auto-generated from #18398 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:
@trujillo-adam
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: unable to process merge commit: "69ea73eea03aca3efb0741ed6f616ee71d8c81a9", automatic backport requires rebase workflow

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


Description

This PR replaces the ordered list used to describe the order of operations for determining agent rate limits with a diagram. It includes light and dark mode versions of the diagram. I commented out the list instead of deleting it in case we wanted to revert.

PR Checklist

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

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/add-rate-limit-ops-diagram/widely-alive-mallard branch from 7a454cb to 2888f60 Compare August 8, 2023 16:49
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/add-rate-limit-ops-diagram/widely-alive-mallard branch from 80aa15b to 3b8ac85 Compare August 8, 2023 16:49
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

@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Aug 8, 2023
@trujillo-adam trujillo-adam marked this pull request as ready for review August 8, 2023 17:11
@trujillo-adam trujillo-adam requested a review from a team as a code owner August 8, 2023 17:11
@trujillo-adam trujillo-adam merged commit 9ef8d0e into release/1.16.x Aug 8, 2023
@trujillo-adam trujillo-adam deleted the backport/docs/add-rate-limit-ops-diagram/widely-alive-mallard branch August 8, 2023 17:11
@trujillo-adam trujillo-adam restored the backport/docs/add-rate-limit-ops-diagram/widely-alive-mallard branch August 8, 2023 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants