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: support redis v7.2.4 and change default image of redis v7.0.6 #571

Merged
merged 4 commits into from
May 22, 2024

Conversation

Y-Rookie
Copy link
Contributor

No description provided.

@Y-Rookie
Copy link
Contributor Author

bugfix: apecloud/kubeblocks#7399

@Y-Rookie Y-Rookie merged commit 6724d0a into main May 22, 2024
1 check passed
@Y-Rookie Y-Rookie deleted the support/support-redis-v720 branch May 22, 2024 09:12
@Y-Rookie
Copy link
Contributor Author

/cherry-pick release-0.9

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging addons/redis-cluster/Chart.yaml
Auto-merging addons/redis-cluster/templates/_helpers.tpl
CONFLICT (modify/delete): examples/redis/cluster-sharding.yaml deleted in HEAD and modified in 6724d0a (chore: support redis v7.2.4 and change default image of redis v7.0.6 (#571)). Version 6724d0a (chore: support redis v7.2.4 and change default image of redis v7.0.6 (#571)) of examples/redis/cluster-sharding.yaml left in tree.
error: could not apply 6724d0a... chore: support redis v7.2.4 and change default image of redis v7.0.6 (#571)
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".

@apecloud-bot
Copy link
Collaborator

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

Y-Rookie added a commit that referenced this pull request May 22, 2024
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.

4 participants