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

fix: correct inference module pod spec generate #92

Merged
merged 3 commits into from
Sep 4, 2024

Conversation

kaysonyu
Copy link
Contributor

@kaysonyu kaysonyu commented Sep 4, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?


Additional documentation e.g., design docs, usage docs, etc.:


@liu-hm19
Copy link
Contributor

liu-hm19 commented Sep 4, 2024

@SS-Yuki The SS-Yuki:mypr has conflicts with the main branch, you may solve the conflicts with the following commands (suppose the alias of the remote SS-Yuki/catalog repo is origin, and the local branch is mypr):

# Add `KusionStack/catalog` as the remote repository. 
git remote add kusionstack https://github.com/KusionStack/catalog.git

# Merge the `KusionStack:main` into local branch. 
git pull kusionstack/main

# After solving the conflicts, commit the codes and force-push to the remote `SS-Yuki:mypr`. 
git add .
git commit -m "fix: correct inference module pod spec generate"
git push origin -f mypr:mypr

@liu-hm19 liu-hm19 requested review from liu-hm19 and removed request for elliotxx and adohe September 4, 2024 07:15
@liu-hm19 liu-hm19 added the bug Something isn't working label Sep 4, 2024
Copy link
Contributor

@liu-hm19 liu-hm19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@liu-hm19 liu-hm19 merged commit 67ba019 into KusionStack:main Sep 4, 2024
4 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Sep 4, 2024
@kaysonyu kaysonyu deleted the mypr branch September 4, 2024 08:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants