Skip to content

chore: support es 7.10.2#2336

Merged
kizuna-lek merged 2 commits intomainfrom
support/es-7.10.2
Dec 22, 2025
Merged

chore: support es 7.10.2#2336
kizuna-lek merged 2 commits intomainfrom
support/es-7.10.2

Conversation

@kizuna-lek
Copy link
Contributor

No description provided.

@kizuna-lek kizuna-lek added the pick-1.0 Auto cherry-pick to release-1.0 when PR merged label Dec 22, 2025
@kizuna-lek kizuna-lek requested review from a team and leon-inf as code owners December 22, 2025 03:46
@github-actions github-actions bot requested review from a team and leon-inf as code owners December 22, 2025 03:46
@kizuna-lek
Copy link
Contributor Author

/approve

@kizuna-lek kizuna-lek added pick-0.9 Auto cherry-pick to release-0.9 when PR merged and removed pick-0.9 Auto cherry-pick to release-0.9 when PR merged labels Dec 22, 2025
@kizuna-lek kizuna-lek merged commit e3b5a4e into main Dec 22, 2025
20 of 22 checks passed
@kizuna-lek kizuna-lek deleted the support/es-7.10.2 branch December 22, 2025 05:07
@apecloud-bot
Copy link
Collaborator

/cherry-pick release-1.0

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply e3b5a4e... chore: support es 7.10.2 (#2336)
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 set advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

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

kizuna-lek added a commit that referenced this pull request Dec 22, 2025
Co-authored-by: kizuna-lek <kizuna-lek@users.noreply.github.com>
(cherry picked from commit e3b5a4e)
kizuna-lek added a commit that referenced this pull request Dec 22, 2025
Co-authored-by: kizuna-lek <kizuna-lek@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pick-1.0 Auto cherry-pick to release-1.0 when PR merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants