Skip to content

Merge upstream master (1b883bf) into integration - #3

Merged
eduralph merged 4 commits into
integrationfrom
sync-upstream-1b883bf
Oct 20, 2026
Merged

eduralph merged 4 commits into
integrationfrom
sync-upstream-1b883bf

Conversation

@eduralph

Copy link
Copy Markdown

tikv/client-rust merged tikv#557 (d98fb52) and tikv#551 (6bdbe46), which integration already carries, and tikv#575 (IDE components in the pinned toolchain). The merge is clean: only rust-toolchain.toml changes. tikv#558 is still open upstream and stays carried; its branch already contains this master, so nothing is rebased.

Sync per client-rust-pdca ADR-0015 rule 4 and client-rust-test ADR-0001. The pin move in client-rust-test follows once this is merged: rev = this merge, upstream_base = 1b883bf, and the pre-557 feature is deleted.

eduralph and others added 4 commits October 19, 2026 01:59
…ors (tikv#557)

 \n\nSigned-off-by: Eduard R. <eduard@ralphovi.net>
…v#525, mitigates tikv#516) (tikv#551)

fixes tikv#525\n\nSigned-off-by: Eduard R. <eduard@ralphovi.net>
fixes tikv#574\n\nSigned-off-by: Ping Yu <yuping@pingcap.com>\n\nCo-authored-by: iosmanthus <dengliming@pingcap.com>
tikv/client-rust merged tikv#557 (d98fb52) and tikv#551 (6bdbe46), both carried here
already, and tikv#575 (IDE components in the pinned toolchain). Only
rust-toolchain.toml changes; tikv#558 stays carried and is still open upstream.

Signed-off-by: Eduard Ralph <eduard@ralphovi.net>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-20T10:42:05.632377Z 672d113 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@eduralph
eduralph merged commit 18eff6d into integration Oct 20, 2026
eduralph added a commit to getwyrd/client-rust-test that referenced this pull request Oct 20, 2026
integration merged upstream master 1b883bf (getwyrd/client-rust#3): #557 and
#551 are now in upstream_base, #558 is still carried. A reviewed pin bump
(ADR-0001); the evidence at this pin follows in its own commit.

Signed-off-by: Eduard Ralph <eduard@ralphovi.net>
@eduralph
eduralph deleted the sync-upstream-1b883bf branch October 20, 2026 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants