You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2022/11/10 19:43:58 UTC

[cassandra] branch cassandra-4.1 updated (98f11efe44 -> 106bc89d74)

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

brandonwilliams pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 98f11efe44 Merge branch 'cassandra-4.0' into cassandra-4.1
     new 35826b7447 Fix error message about type hints (CASSANDRA-17915)
     new 106bc89d74 Merge branch 'cassandra-4.0' into cassandra-4.1

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                                    |  1 +
 .../org/apache/cassandra/cql3/functions/FunctionResolver.java  |  2 +-
 .../org/apache/cassandra/cql3/functions/OperationFctsTest.java | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 106bc89d741925e19a0c80c1d84e2b8794d1ece1
Merge: 98f11efe44 35826b7447
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu Nov 10 13:37:59 2022 -0600

    Merge branch 'cassandra-4.0' into cassandra-4.1

 CHANGES.txt                                                    |  1 +
 .../org/apache/cassandra/cql3/functions/FunctionResolver.java  |  2 +-
 .../org/apache/cassandra/cql3/functions/OperationFctsTest.java | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --cc CHANGES.txt
index a9a1091c9d,d358361178..2d39281a92
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,13 +1,12 @@@
 -4.0.8
 +4.1-beta2
 + * Restore streaming_keep_alive_period on the netty control streaming channel (CASSANDRA-17768)
 + * Move Schema.FORCE_LOAD_KEYSPACES and Schema.FORCE_LOAD_KEYSPACES_PROP to CassandraRelevantProps (CASSANDRA-17783)
 + * Add --resolve-ip option to nodetool gossipinfo (CASSANDRA-17934)
 + * Allow pre-V5 global limit on bytes in flight to revert to zero asynchronously in RateLimitingTest (CASSANDRA-17927)
 +Merged from 4.0:
+  * Fix error message about type hints (CASSANDRA-17915)
   * Fix possible race condition on repair snapshots (CASSANDRA-17955)
   * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
 -Merged from 3.11:
 - * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
 -Merged from 3.0:
 - * Fix running Ant rat targets without git (CASSANDRA-17974)
 -
 -4.0.7
   * 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)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org