Repository navigation
chore: record upstream 4.19.4 ancestry (do not squash) - #1346
Merged
Merged
Conversation
Patch by Bret McGuire; reviewed by Andy Tolbert and Bret McGuire reference: apache#2066
patch by April Murphy; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2064
The primary goal here is to address CVE-2025-12183. Netty includes a dependency on vulnerable versions of lz4-java, so update to a fixed version of Netty as well. On the C* server side, we opted to move to the new community fork of lz4-java, so match that decision here (CASSANDRA-21052). patch by Abe Ratnofsky; reviewed by Francisco Guerrero for CASSJAVA-113
patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2051
β¦kdocs I've been looking into details on custom codes and noticed that the there is an issue with rendering bullet points on the following page: https://apache.github.io/cassandra-java-driver/4.19.0/core/custom_codecs/
β¦der correctly while working on the previous ninja-fix
β¦ringClause abstraction. This allows for custom impls to define their own logic for managing "ORDER BY" clauses. patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2047
patch by Lukasz Antoniak; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2075
patch by Bret McGuire: reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2076
patch by Bret McGuire; reviewed by Bret McGuire and Lukasz Antoniak reference: apache#2052
This reverts commit de96ce8.
patch by Jason Koch; reviewed by Lukasz Antoniak and Bret McGuire reference: apache#2050
patch by David Stringer; reviewed by Lukasz Antoniak and Bret McGuire reference: apache#2022
patch by Jane He; reviewed by Bret McGuire and Andy Tolbert
patch by Jane He; review by Bret McGuire and Andy Tolbert
β¦ Build CI for Java Driver Doc Patch by Jane He and Εukasz Antoniak; Reviewed by Bret McGuire
This reverts commit 342088c.
This reverts commit 375e4b5.
β¦ of the original PR (apache#1901). The change that was actually merged attempted to bump us up to the most recent Java8-compatible logback impl. This moved us from 1.2.x to 1.3.x which in turn brought some dependency changes that were excessive, especially for a patch release. patch by Bret McGuire; reviewed by Andy Tolbert and Abe Ratnofsky reference: apache#2088
This reverts commit 8e2e70c.
β¦ity model) Wires the conventional AGENTS.md -> SECURITY.md -> security model chain so automated tooling can mechanically discover the project's security model. No model content is changed. Generated-by: Claude Opus 4.8 (1M context) patch by Jarek Potiuk; reviewed by Bret McGuire reference: apache#2092
patch by Jane He; reviewed by Michael Semb Wever
β¦ometry equality patch by Bret McGuire; reviewed by Jane He
patch by Bret McGuire; reviewed by Andy Tolbert
scylladb#1291 and scylladb#1344 were squash-merged, so scylla-4.x carries the 4.19.3 and 4.19.4 changes but not apache's tags in its history. This merge records 4.19.4 (and through it 4.19.3) as an ancestor without changing any file. Fixes scylladb#1345 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Important Draft PR not reviewedDraft PRs are not automatically reviewed by default.
To automatically review draft PRs, update your CodeRabbit configuration: reviews:
auto_review:
drafts: true
Comment |
|
This pull request merges upstream |
nikagra
marked this pull request as ready for review
October 30, 2026 14:18
Code Review by QodoNo Changes in PRQodo reviewed your PR and found no changes in the codeTip of the dayπ‘ Did you know, you can route each severity your way: inline, summary, both, or drop Powered by Qodo |
dkropachev
approved these changes
Oct 30, 2026
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.
Warning
Merge with "Create a merge commit" only, using the ruleset bypass. Squash or rebase produces an empty commit and leaves the ancestry missing, which is what happened to #1344.
#1291 and #1344 were both squash-merged, so
scylla-4.xhas the 4.19.3 and 4.19.4 changes but not apache's tags in its history. Without them, future upstream merges would replay those releases.git merge -s oursof apache's4.19.4tag (b98e35eb05), which also brings in4.19.3Verified: the commit has two parents (
814fed823e,b98e35eb05),git diff HEAD^1 HEADis empty, and4.19.2,4.19.3and4.19.4are all ancestors of HEAD (git merge-base --is-ancestor). After merging,scylla-4.x's head should have two parents.Fixes #1345
π€ Generated with Claude Code