Repository navigation
Commit aad7cd1
committed
Merge origin/develop into ci/hosted-runner-workflows
develop unified ollama-proxy and lmstudio-proxy into nvpair-proxy, taking
versions.json from 13 components to 12 and moving product/installer to 1.2.0.
Conflicts were all the same collision: this branch renames product/installer
to a single services key, develop changed the component list underneath it.
Resolved by taking develop's components and this branch's key.
services/versions.json services: 1.2.0, develop's 12 components
services/build.sh V_SERVICES + nvpair-proxy
services/build.bat same
Three follow-ups git could not do:
- the pull request template's bump list had to move to the 12 new keys, or
every pull request would fail the strict key check
- services/nvpair-cluster-manager/spec.md, new on develop, told contributors
to bump installer and product by hand
- docs/services-api.md regenerated
The two clocks have not converged: product went to 1.2.0 while
desktop/package.json stayed 0.1.1, so the rename is if anything better
motivated than when it was written.388 files changed
Lines changed: 39296 additions & 13332 deletions
File tree
- .agents/skills
- kaizen-ui
- references
- components
- guides
- pair-test-style
- sync-backend
- .cursor
- hooks
- rules
- skills/pair-github-pr
- .github
- desktop
- docs
- native/PrivilegedHelper
- scripts
- build
- macos
- src
- electron
- service-bridge
- ui
- api
- components
- BackendRow
- NodeList
- Workloads
- constants
- stores
- types
- utils
- tests/modular
- docs
- assets/onboarding
- engine-lifecycle
- getting-started
- overview
- terminal-interface
- fern
- scripts
- collectlogs/testdata
- inference-dispatcher
- services
- installer
- linux
- lmstudio-proxy
- nvpair-cluster-manager
- nvpair-engine-manager
- manifests
- testdata
- fakeengine
- fuzz/FuzzLaunchBindings
- nvpair-job-scheduler
- nvpair-manual-nodes
- nvpair-proxy
- nvpair-tui
- ui
- nvpair-ui-broker
- workloadstore
- nvpair-workload-manager
- ollama-proxy
- tests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
0 commit comments