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-0.5] support large scale for ads mode #907

Closed
kmesh-bot opened this issue Sep 27, 2024 · 2 comments
Closed

[release-0.5] support large scale for ads mode #907

kmesh-bot opened this issue Sep 27, 2024 · 2 comments
Assignees

Comments

@kmesh-bot
Copy link
Collaborator

Manual cherrypick required.

#610 failed to apply on top of branch "release-0.5":

Applying: support lage scale for ads mode
Using index info to reconstruct a base tree...
M	bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.c
M	bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.h
Falling back to patching base and 3-way merge...
Auto-merging bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.h
Auto-merging bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.c
CONFLICT (content): Merge conflict in bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 support lage scale for ads mode
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".

@nlgwcy
Copy link
Contributor

nlgwcy commented Sep 27, 2024

#909

@hzxuzhonghu
Copy link
Member

done

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

3 participants