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: add label for mariadb cmpd #994

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Conversation

JashBook
Copy link
Collaborator

No description provided.

@JashBook JashBook merged commit dfe58aa into main Sep 3, 2024
9 checks passed
@JashBook JashBook deleted the support/add_label_for_mariadb_cmpd branch September 3, 2024 07:40
@JashBook
Copy link
Collaborator Author

JashBook commented Sep 3, 2024

/cherry-pick release-0.9

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): addons/mariadb/templates/cmpd.yaml deleted in HEAD and modified in dfe58aa (chore: add label for mariadb cmpd (#994)). Version dfe58aa (chore: add label for mariadb cmpd (#994)) of addons/mariadb/templates/cmpd.yaml left in tree.
Auto-merging addons/risingwave/templates/_helpers.tpl
Auto-merging addons/tidb/templates/_helpers.tpl
error: could not apply dfe58aa... chore: add label for mariadb cmpd (#994)
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/10678646952

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

Successfully merging this pull request may close these issues.

3 participants