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: add shortcut for qdrant #395

Merged
merged 2 commits into from
Jul 11, 2024
Merged

feat: add shortcut for qdrant #395

merged 2 commits into from
Jul 11, 2024

Conversation

iziang
Copy link
Contributor

@iziang iziang commented Jul 10, 2024

No description provided.

@github-actions github-actions bot added the size/S Denotes a PR that changes 10-29 lines. label Jul 10, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jul 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 44.86%. Comparing base (9b8c5c5) to head (1d33062).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #395      +/-   ##
==========================================
+ Coverage   44.85%   44.86%   +0.01%     
==========================================
  Files         157      157              
  Lines       22981    22987       +6     
==========================================
+ Hits        10308    10314       +6     
  Misses      11441    11441              
  Partials     1232     1232              
Flag Coverage Δ
unittests 44.86% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ldming
Copy link
Collaborator

ldming commented Jul 11, 2024

make kbcli-doc to generate the document.

@iziang
Copy link
Contributor Author

iziang commented Jul 11, 2024

make kbcli-doc to generate the document.

done

@iziang iziang merged commit bc082e8 into main Jul 11, 2024
10 checks passed
@iziang iziang deleted the support/qdrant branch July 11, 2024 13:39
@github-actions github-actions bot added this to the Release 0.9.0 milestone Jul 11, 2024
@iziang
Copy link
Contributor Author

iziang commented Jul 11, 2024

/cherry-pick release-0.9

Copy link

🤖 says: Error cherry-picking.

Auto-merging Makefile
Failed to merge submodule addons (not checked out)
CONFLICT (submodule): Merge conflict in addons
Auto-merging docs/user_docs/cli/kbcli_cluster_create.md
Auto-merging pkg/cluster/builtin_charts.go
warning: Cannot merge binary files: pkg/cluster/charts/apecloud-mysql-cluster.tgz (HEAD vs. bc082e8 (feat: add shortcut for qdrant (#395)))
Auto-merging pkg/cluster/charts/apecloud-mysql-cluster.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/apecloud-mysql-cluster.tgz
warning: Cannot merge binary files: pkg/cluster/charts/mongodb-cluster.tgz (HEAD vs. bc082e8 (feat: add shortcut for qdrant (#395)))
Auto-merging pkg/cluster/charts/mongodb-cluster.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/mongodb-cluster.tgz
CONFLICT (modify/delete): pkg/cluster/charts/mysql-cluster.tgz deleted in HEAD and modified in bc082e8 (feat: add shortcut for qdrant (#395)). Version bc082e8 (feat: add shortcut for qdrant (#395)) of pkg/cluster/charts/mysql-cluster.tgz left in tree.
warning: Cannot merge binary files: pkg/cluster/charts/postgresql-cluster.tgz (HEAD vs. bc082e8 (feat: add shortcut for qdrant (#395)))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"

Auto-merging pkg/cluster/charts/postgresql-cluster.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/postgresql-cluster.tgz
warning: Cannot merge binary files: pkg/cluster/charts/xinference-cluster.tgz (HEAD vs. bc082e8 (feat: add shortcut for qdrant (#395)))
Auto-merging pkg/cluster/charts/xinference-cluster.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/xinference-cluster.tgz
error: could not apply bc082e8... feat: add shortcut for qdrant (#395)
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/9892536913

iziang added a commit that referenced this pull request Jul 11, 2024
(cherry picked from commit bc082e8)
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.

4 participants