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 read timeout for ollama #18417

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Fix read timeout for ollama #18417

merged 1 commit into from
Sep 27, 2024

Conversation

ConradIrwin
Copy link
Member

Supercedes: #18310

Release Notes:

  • Fixed low_speed_timeout_in_seconds for Ollama

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Sep 27, 2024
@ConradIrwin ConradIrwin merged commit 02d0561 into main Sep 27, 2024
9 checks passed
@ConradIrwin ConradIrwin deleted the ollama-timeout branch September 27, 2024 06:36
schpet added a commit to schpet/zed that referenced this pull request Oct 3, 2024
* upstream/main: (33 commits)
  Fine-tune hunk control spacing (zed-industries#18463)
  Add tooltip for code actions icon button (zed-industries#18461)
  More git hunk highlighting fixes (zed-industries#18459)
  Move git hunk controls to the left side (zed-industries#18460)
  Capitalize tooltip labels on buffer search (zed-industries#18458)
  Install cargo-edito without extra features (zed-industries#18457)
  Fix bugs in diff hunk highlighting (zed-industries#18454)
  Remove Qwen2 model (zed-industries#18444)
  vim: Command selection fixes (zed-industries#18424)
  Add a `get-release-notes-since` script (zed-industries#18445)
  Fix GoToDefinition changing the viewport unnecessarily (zed-industries#18441)
  docs: Ollama api_url improvements (zed-industries#18440)
  Fix missing tooltips for selected buttons (zed-industries#18435)
  Add missing shortcuts in tooltips (zed-industries#18282)
  assistant: Fix copy/cut not working when selection is empty (zed-industries#18403)
  Fix the numeration in line wrap docs (zed-industries#18428)
  ssh remoting: Show error if opening connection timed out (zed-industries#18401)
  project: Fix worktree store event missing in remote projects (zed-industries#18376)
  Fix read timeout for ollama (zed-industries#18417)
  vim: Support za (zed-industries#18421)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant