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

[release-1.22] added perf test for 1.22 #15229

Open
istio-testing opened this issue Jun 3, 2024 · 0 comments
Open

[release-1.22] added perf test for 1.22 #15229

istio-testing opened this issue Jun 3, 2024 · 0 comments
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

#15196 failed to apply on top of branch "release-1.22":

Applying: istio 1.20 performance result
Using index info to reconstruct a base tree...
M	content/en/docs/ops/deployment/performance-and-scalability/index.md
A	content/en/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg
A	content/en/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg
Falling back to patching base and 3-way merge...
Auto-merging content/en/docs/ops/deployment/performance-and-scalability/index.md
CONFLICT (content): Merge conflict in content/en/docs/ops/deployment/performance-and-scalability/index.md
CONFLICT (rename/delete): content/en/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg deleted in istio 1.20 performance result and renamed to archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg in HEAD. Version HEAD of archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg left in tree.
CONFLICT (rename/delete): content/en/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg deleted in istio 1.20 performance result and renamed to archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg in HEAD. Version HEAD of archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 istio 1.20 performance result
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".

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

No branches or pull requests

2 participants