This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d40c9d1abfbf7f3ed4f27be18ce9ca6730517d2d Merge: 97bee6abc1 0b8f889213 Author: Stefan Miklosovic <[email protected]> AuthorDate: Wed Nov 29 18:36:28 2023 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../repair/consistent/admin/PendingStats.java | 7 ++++--- .../distributed/test/IncRepairAdminTest.java | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index d7a77cf7cf,1b6eb2be89..f9ef2028eb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -50,9 -54,8 +50,10 @@@ Merged from 4.1 * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) Merged from 4.0: - * Retrieve keyspaces metadata and schema version concistently in DescribeStatement (CASSANDRA-18921) ++ * Fix nodetool repair_admin summarize-pending command to not throw exception (CASSANDRA-19014) + * Fix cassandra-stress in simplenative mode with prepared statements (CASSANDRA-18744) + * Fix filtering system ks sstables for relocation on startup (CASSANDRA-18963) + * Remove completed coordinator sessions (CASSANDRA-18903) * Gossip NPE due to shutdown event corrupting empty statuses (CASSANDRA-18913) * Update hdrhistogram to 2.1.12 (CASSANDRA-18893) * Improve performance of compactions when table does not have an index (CASSANDRA-18773) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
