This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 753f81d53a9313bb469869e0bf53cd719c2cbf25 Merge: 7b891db36d 7a2bfdc56d Author: Jacek Lewandowski <[email protected]> AuthorDate: Thu Nov 9 16:08:59 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix incorrect seeking through the sstable iterator by IndexState CHANGES.txt | 1 + .../io/sstable/AbstractSSTableIterator.java | 9 ++ .../io/sstable/format/big/IndexState.java | 5 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 30 +++- .../cql3/ViewAbstractParameterizedTest.java | 4 +- .../io/sstable/format/ColumnIndexTest.java | 165 +++++++++++++++++++++ 6 files changed, 203 insertions(+), 11 deletions(-) diff --cc CHANGES.txt index d7a0a03b6d,970933fab5..a2c41d017a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-beta1 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Fix incorrect seeking through the sstable iterator by IndexState (CASSANDRA-18932) * Upgrade Python driver to 3.28.0 (CASSANDRA-18960) * Add retries to IR messages (CASSANDRA-18962) * Add metrics and logging to repair retries (CASSANDRA-18952) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
