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

feat: update addon to newest #405

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Conversation

lynnleelhl
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the size/XS Denotes a PR that changes 0-9 lines. label Jul 16, 2024
@ldming ldming merged commit 1c287d8 into main Jul 16, 2024
10 of 11 checks passed
@ldming ldming deleted the feature/upgrade-addon-to-newest branch July 16, 2024 05:57
@github-actions github-actions bot added this to the Release 0.9.0 milestone Jul 16, 2024
@lynnleelhl
Copy link
Contributor Author

/cherry-pick release-0.9

Copy link

🤖 says: Error cherry-picking.

Failed to merge submodule addons (not checked out)
hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint: - come back to superproject and run:
hint:
hint: git add addons
hint:
hint: to record the above merge or update
hint: - resolve any other conflicts in the superproject
hint: - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config advice.submoduleMergeConflict false"
CONFLICT (submodule): Merge conflict in addons
warning: Cannot merge binary files: pkg/cluster/charts/elasticsearch-cluster.tgz (HEAD vs. 1c287d8 (feat: update addon to newest (#405)))
Auto-merging pkg/cluster/charts/elasticsearch-cluster.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/elasticsearch-cluster.tgz
error: could not apply 1c287d8... feat: update addon to newest (#405)
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"

Copy link

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kbcli/actions/runs/9951561254

lynnleelhl added a commit that referenced this pull request Jul 16, 2024
(cherry picked from commit 1c287d8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants