Repository navigation
Conversation
* feat: Add Pinecone online store integration Signed-off-by: Siddhesh Khairnar <[email protected]> * fix: Align Pinecone store with filters API and operator types Signed-off-by: Siddhesh Khairnar <[email protected]> * test: Expand Pinecone online store unit test coverage Signed-off-by: Siddhesh Khairnar <[email protected]> * fix: Address Pinecone online store review feedback Signed-off-by: Siddhesh Khairnar <[email protected]> * ci: Retrigger CI after flaky macOS dependency download Signed-off-by: Siddhesh Khairnar <[email protected]> * fix: Resolve rebase conflicts keeping chronon and pinecone Signed-off-by: Siddhesh Khairnar <[email protected]> * fix: Prevent protobuf downgrade breaking grpc health checks Signed-off-by: Siddhesh Khairnar <[email protected]> * fix: Revert protobuf pin that broke flink and pixi lock Keep uv --no-sync for CI so hashed protobuf 7.x is preserved without conflicting with feast[flink]. Signed-off-by: Siddhesh Khairnar <[email protected]> --------- Signed-off-by: Siddhesh Khairnar <[email protected]>
Signed-off-by: Joystyxx <[email protected]> Co-authored-by: Shuchu Han <[email protected]>
…east-dev#7098) Several Args entries named a parameter the function does not have. Rename them to the actual parameter or drop them, and update the DecisionEvaluator example, which passed a DecisionStrategy that the constructor does not accept. Signed-off-by: mmporong <[email protected]> Co-authored-by: Shuchu Han <[email protected]>
…ev#7102) Bumps [minimatch](https://github.com/isaacs/minimatch) from 10.2.6 to 11.0.1. - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v10.2.6...v11.0.1) --- updated-dependencies: - dependency-name: minimatch dependency-version: 11.0.1 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
The upstream sync in feast-dev#276 was squash-merged, so ODH master lost its link to upstream e0eb369. The scheduled sync job then merges the same upstream commits again and hits the same .secrets.baseline conflict. This merge uses the "ours" strategy, so no files change. It only records upstream e0eb369 as merged, so the next sync job starts from there. Signed-off-by: Chaitany Patel <[email protected]>
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
 |
jyejare
approved these changes
Nov 5, 2026
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: jyejare, patelchaitany The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
/early-gate-build |
This was referenced Nov 5, 2026
jyejare
pushed a commit
that referenced
this pull request
Nov 5, 2026
The upstream sync in #276 and the record-only fix in #281 were both squash-merged, so ODH master still has no link to upstream e0eb369. The scheduled sync job then merges the same upstream commits again and hits the same .secrets.baseline conflict. This merge uses the "ours" strategy, so no files change. It only records upstream e0eb369 as merged, so the next sync job starts from there. It must land as a merge commit; a squash drops the link. Signed-off-by: Chaitany Patel <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
One merge commit that changes no files. It records upstream feast-dev/feast master (
e0eb36993) as merged into ODH master.Why
The upstream sync in #276 was squash-merged. A squash keeps the code but drops the link to the upstream commits. So the scheduled sync job thinks those 4 upstream commits are still unmerged, merges them again, and fails on the same
.secrets.baselineconflict every run.All the upstream code is already in master. This commit only restores the history link (
git merge -s ours), so the next sync job starts frome0eb36993.Please merge with "Create a merge commit", or let tide merge it after
/lgtm. Do not squash. Squashing would drop the link again, and the sync job would keep failing.Tested
git diff origin/master HEAD: 0 files changed.git merge upstream/masteron top of this commit:Already up to date.On master without this commit, it givesCONFLICT (content): Merge conflict in .secrets.baseline.