Skip to content

Conversation

@zjy365
Copy link
Collaborator

@zjy365 zjy365 commented Dec 5, 2025

No description provided.

@zjy365 zjy365 requested a review from a team as a code owner December 5, 2025 03:30
@cuisongliu cuisongliu added this to the v5.2 milestone Dec 5, 2025
@cuisongliu cuisongliu merged commit d013390 into labring:main Dec 5, 2025
42 of 43 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Dec 5, 2025

🤖 says: Error cherry-picking.

Auto-merging frontend/providers/applaunchpad/src/pages/app/edit/index.tsx
CONFLICT (content): Merge conflict in frontend/providers/applaunchpad/src/pages/app/edit/index.tsx
Auto-merging frontend/providers/dbprovider/src/constants/db.ts
Auto-merging frontend/providers/dbprovider/src/pages/db/detail/components/AppBaseInfo.tsx
Auto-merging frontend/providers/dbprovider/src/pages/db/edit/components/Form.tsx
error: could not apply d013390... feat(db): add Weaviate support and improve network access control (#6299)
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"

@github-actions
Copy link
Contributor

github-actions bot commented Dec 5, 2025

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/19951920768

zjy365 added a commit to zjy365/sealos that referenced this pull request Dec 5, 2025
…bring#6299)

* feat(db): add Weaviate support and improve network access control

* update launchpad
cuisongliu pushed a commit that referenced this pull request Dec 5, 2025
)

feat(db): add Weaviate support and improve network access control (#6299)

* feat(db): add Weaviate support and improve network access control

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants