This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b87299debe1bbbb5c48897d0199267d1a58067dc
Merge: 070362c883 f869a2bb59
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Dec 17 15:50:33 2022 -0800

    Merge branch 'cassandra-4.1' into trunk
    
    * cassandra-4.1:
      Restore custom param types over messaging system

 CHANGES.txt                                        |  1 +
 .../cassandra/net/CustomParamsSerializer.java      | 73 ++++++++++++++++++++++
 src/java/org/apache/cassandra/net/Message.java     | 17 +++++
 src/java/org/apache/cassandra/net/ParamType.java   |  5 +-
 .../org/apache/cassandra/utils/ByteArrayUtil.java  | 24 +++++++
 .../unit/org/apache/cassandra/net/MessageTest.java | 35 +++++++++++
 6 files changed, 154 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 160ecef46b,f87e2f435e..621d84a20d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -127,12 -69,6 +127,13 @@@ Merged from 4.1
   * Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder 
class and deprecate it in favor of withBufferSizeInMiB(int size) 
(CASSANDRA-17675)
   * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
  Merged from 4.0:
++ * Restore internode custom tracing on 4.0's new messaging system 
(CASSANDRA-17981)
 + * Harden parsing of boolean values in CQL in PropertyDefinitions 
(CASSANDRA-17878)
 + * Fix possible race condition on repair snapshots (CASSANDRA-17955)
 + * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
 + * Remove empty cq4 files in log directory to not fail the startup of BinLog 
(CASSANDRA-17933)
 + * Fix multiple BufferPool bugs (CASSANDRA-16681)
 + * Fix StorageService.getNativeaddress handling of IPv6 addresses 
(CASSANDRA-17945)
   * Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895)
   * Fix repair failure on assertion if two peers have overlapping mismatching 
ranges (CASSANDRA-17900)
   * Better handle null state in Gossip schema migration to avoid NPE 
(CASSANDRA-17864)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to