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

chore: apecloud mysql support rerender after vscale (#460) #834

Conversation

sophon-zt
Copy link
Contributor

No description provided.

@nayutah
Copy link
Contributor

nayutah commented Jul 19, 2024

related bugs : #463 #465 #469 #472 fix them together

@sophon-zt sophon-zt merged commit 026c62a into main Jul 19, 2024
3 checks passed
@sophon-zt sophon-zt deleted the bugfix/apecloud-mysql-smartenginethe-parameter-does-not-take-effect-after-vscale-issue460 branch July 19, 2024 10:04
@sophon-zt
Copy link
Contributor Author

/cherry-pick release-0.9

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): addons/apecloud-mysql/templates/cmpd-apecloudmysql.yaml deleted in HEAD and modified in 026c62a (chore: apecloud mysql support rerender after vscale (#834)). Version 026c62a (chore: apecloud mysql support rerender after vscale (#834)) of addons/apecloud-mysql/templates/cmpd-apecloudmysql.yaml left in tree.
CONFLICT (modify/delete): addons/mysql/templates/cmpd-mysql57-orc.yaml deleted in HEAD and modified in 026c62a (chore: apecloud mysql support rerender after vscale (#834)). Version 026c62a (chore: apecloud mysql support rerender after vscale (#834)) of addons/mysql/templates/cmpd-mysql57-orc.yaml left in tree.
CONFLICT (modify/delete): addons/mysql/templates/cmpd-mysql57.yaml deleted in HEAD and modified in 026c62a (chore: apecloud mysql support rerender after vscale (#834)). Version 026c62a (chore: apecloud mysql support rerender after vscale (#834)) of addons/mysql/templates/cmpd-mysql57.yaml left in tree.
CONFLICT (modify/delete): addons/mysql/templates/cmpd-mysql80-orc.yaml deleted in HEAD and modified in 026c62a (chore: apecloud mysql support rerender after vscale (#834)). Version 026c62a (chore: apecloud mysql support rerender after vscale (#834)) of addons/mysql/templates/cmpd-mysql80-orc.yaml left in tree.
CONFLICT (modify/delete): addons/mysql/templates/cmpd-mysql80.yaml deleted in HEAD and modified in 026c62a (chore: apecloud mysql support rerender after vscale (#834)). Version 026c62a (chore: apecloud mysql support rerender after vscale (#834)) of addons/mysql/templates/cmpd-mysql80.yaml left in tree.
Auto-merging addons/postgresql/templates/componentdefinition-12.yaml
Auto-merging addons/postgresql/templates/componentdefinition-14.yaml
Auto-merging addons/postgresql/templates/componentdefinition-15.yaml
error: could not apply 026c62a... chore: apecloud mysql support rerender after vscale (#834)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks-addons/actions/runs/10006283883

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants