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 concurrency docs #3138

Merged
merged 2 commits into from
Mar 25, 2024
Merged

Conversation

RicHincapie
Copy link
Contributor

Updates concurrency description at proxyConfig to match merged changes here istio/istio#43865

Resolves istio/istio.io#14777

@RicHincapie RicHincapie requested a review from a team as a code owner March 25, 2024 10:50
@istio-policy-bot
Copy link

🤔 🐛 You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

@istio-policy-bot
Copy link

😊 Welcome @RicHincapie! This is either your first contribution to the Istio api repo, or it's been
a while since you've been here.

You can learn more about the Istio working groups, Code of Conduct, and contribution guidelines
by referring to Contributing to Istio.

Thanks for contributing!

Courtesy of your friendly welcome wagon.

@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 25, 2024
@zirain zirain added the release-notes-none Indicates a PR that does not require release notes. label Mar 25, 2024
@zirain
Copy link
Member

zirain commented Mar 25, 2024

please ran make gen locally

@istio-testing istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 25, 2024
@istio-testing istio-testing merged commit 362ae32 into istio:master Mar 25, 2024
5 checks passed
@RicHincapie RicHincapie deleted the fix-concurrency-docs branch March 25, 2024 21:42
@zirain zirain added the cherrypick/release-1.21 Set this label on a PR to auto-merge it to the release-1.21 branch label Mar 26, 2024
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #3138 failed to apply on top of branch "release-1.21":

Applying: Fix concurrency docs
Using index info to reconstruct a base tree...
M	networking/v1beta1/proxy_config.pb.go
Falling back to patching base and 3-way merge...
Auto-merging networking/v1beta1/proxy_config.pb.go
CONFLICT (content): Merge conflict in networking/v1beta1/proxy_config.pb.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix concurrency docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #3141

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherrypick/release-1.21 Set this label on a PR to auto-merge it to the release-1.21 branch release-notes-none Indicates a PR that does not require release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Concurrency proxyConfig definition need updating
6 participants