Skip to content

fix: etcd null params#602

Merged
loomts merged 2 commits into
mainfrom
bugfix/etcd-null-params
May 21, 2025
Merged

fix: etcd null params#602
loomts merged 2 commits into
mainfrom
bugfix/etcd-null-params

Conversation

@loomts
Copy link
Copy Markdown
Contributor

@loomts loomts commented May 21, 2025

@github-actions github-actions Bot added the size/S Denotes a PR that changes 10-29 lines. label May 21, 2025
@loomts loomts changed the title fix null params fix: etcd null params May 21, 2025
@loomts loomts merged commit 1ab90dc into main May 21, 2025
10 of 11 checks passed
@loomts loomts deleted the bugfix/etcd-null-params branch May 21, 2025 08:27
@github-actions github-actions Bot added this to the Release 1.0 milestone May 21, 2025
@loomts
Copy link
Copy Markdown
Contributor Author

loomts commented May 21, 2025

/cherry-pick release-1.0

@apecloud-bot
Copy link
Copy Markdown
Collaborator

🤖 says: Error cherry-picking.

warning: Cannot merge binary files: pkg/cluster/charts/etcd.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/etcd.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/etcd.tgz
warning: Cannot merge binary files: pkg/cluster/charts/kafka.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/kafka.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/kafka.tgz
warning: Cannot merge binary files: pkg/cluster/charts/mongodb.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/mongodb.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/mongodb.tgz
warning: Cannot merge binary files: pkg/cluster/charts/mysql.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/mysql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/mysql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/postgresql.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/postgresql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/postgresql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/qdrant.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/qdrant.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/qdrant.tgz
warning: Cannot merge binary files: pkg/cluster/charts/rabbitmq.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/rabbitmq.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/rabbitmq.tgz
warning: Cannot merge binary files: pkg/cluster/charts/redis.tgz (HEAD vs. 1ab90dc (fix: etcd null params (#602)))
Auto-merging pkg/cluster/charts/redis.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/redis.tgz
Auto-merging pkg/cmd/cluster/delete.go
Auto-merging pkg/util/flags/flags.go
error: could not apply 1ab90dc... fix: etcd null params (#602)
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
Copy Markdown
Collaborator

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/S Denotes a PR that changes 10-29 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG]kbcli addon enable etcd, with unsupported json schema type [null string]

3 participants