This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7f4e9bb67bbcb09a11d62609aa1c15a011463d86 Merge: 933af9b2db ae995eb3d3 Author: Jon Meredith <[email protected]> AuthorDate: Tue May 9 17:47:55 2023 -0600 Merge branch 'cassandra-4.0' into cassandra-4.1 CHANGES.txt | 1 + .../serializers/CollectionSerializer.java | 8 +++++ .../cassandra/serializers/ListSerializer.java | 9 ++++-- .../cassandra/serializers/MapSerializer.java | 8 ++--- .../cassandra/serializers/SetSerializer.java | 4 +-- .../cql3/validation/entities/CollectionsTest.java | 4 +-- .../apache/cassandra/transport/SerDeserTest.java | 36 ++++++++++++++++++++++ 7 files changed, 60 insertions(+), 10 deletions(-) diff --cc CHANGES.txt index c3659802b2,ac053c3f5b..08da17a5a3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -4.0.10 +4.1.2 + * Allow keystore and trustrore passwords to be nullable (CASSANDRA-18124) + * Return snapshots with dots in their name in nodetool listsnapshots (CASSANDRA-18371) + * Fix NPE when loading snapshots and data directory is one directory from root (CASSANDRA-18359) + * Do not submit hints when hinted_handoff_enabled=false (CASSANDRA-18304) + * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353) + * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354) +Merged from 4.0: + * NPE when deserializing malformed collections from client (CASSANDRA-18505) * Improve 'Not enough space for compaction' logging messages (CASSANDRA-18260) * Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest (CASSANDRA-18474) * Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
