Repository navigation
test: upstream sync ancestry check (throwaway) - #1
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.
|
This pull request merges upstream |
|
@nikagra this merge dropped #1 was merged into Repair it with a pull request that holds only an ancestry merge, merged with Create a merge commit (as scylladb#1281 did): |
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
9 participants
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.
Throwaway test of the upstream-sync-ancestry workflow; will be squash-merged and deleted.