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 2023/09/15 17:31:12 UTC
[cassandra] branch trunk updated (188df44c8c -> f7472774f4)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 188df44c8c Merge branch 'cassandra-5.0' into trunk
new edf22ed776 Revert 18543 but retain properties
new edde699a06 Merge branch 'cassandra-3.11' into cassandra-4.0
new b8209a06fb Merge branch 'cassandra-4.0' into cassandra-4.1
new 1ac31a64a9 Merge branch 'cassandra-4.1' into cassandra-5.0
new f7472774f4 Merge branch 'cassandra-5.0' into trunk
The 5 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 | 2 ++
src/java/org/apache/cassandra/gms/Gossiper.java | 46 ++-----------------------
2 files changed, 5 insertions(+), 43 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-5.0' into trunk
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f7472774f4c4e909af4a8a75c85ac5df71c71b63
Merge: 188df44c8c 1ac31a64a9
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Sep 15 12:30:29 2023 -0500
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/gms/Gossiper.java | 46 ++-----------------------
2 files changed, 5 insertions(+), 43 deletions(-)
diff --cc CHANGES.txt
index 0b82df78b2,57e2b39d23..ba24ef078e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,6 -8,6 +9,7 @@@ Merged from 4.1
* Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466)
Merged from 4.0:
Merged from 3.11:
++ * Revert CASSANDRA-18543 (CASSANDRA-18854)
Merged from 3.0:
* Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818)
@@@ -225,7 -208,11 +226,8 @@@ Merged from 4.1
Merged from 4.0:
* Partial compaction can resurrect deleted data (CASSANDRA-18507)
Merged from 3.11:
- * Revert CASSANDRA-18543 (CASSANDRA-18854)
+ * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739)
Merged from 3.0:
- * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
- * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585)
* CQLSH emits a warning when the server version doesn't match (CASSANDRA-18745)
* Fix missing speculative retries in tablestats (CASSANDRA-18767)
* Fix Requires for Java for RPM package (CASSANDRA-18751)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org