You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yc...@apache.org on 2021/06/27 05:15:24 UTC
[cassandra] branch trunk updated (aac6f7d -> e10ed27)
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from aac6f7d Merge branch 'cassandra-4.0' into trunk
add 2fba5c8 Avoid memoizing the wrong min cluster version during upgrades
add 1a10792 Merge branch 'cassandra-4.0.0' into cassandra-4.0
new e10ed27 Merge branch 'cassandra-4.0' into trunk
The 1 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/dht/BootStrapper.java | 5 ++++-
src/java/org/apache/cassandra/gms/Gossiper.java | 17 +++++++++++-----
.../cassandra/schema/MigrationCoordinator.java | 5 +++++
.../apache/cassandra/service/StorageService.java | 23 ++++++++++++++++++++++
test/unit/org/apache/cassandra/Util.java | 10 +++++++++-
.../operations/InsertUpdateIfConditionTest.java | 4 ++--
.../org/apache/cassandra/gms/GossiperTest.java | 3 ++-
8 files changed, 58 insertions(+), 10 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 trunk
Posted by yc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e10ed27cfef2c79134f9ddd8dd3315a454de51f3
Merge: aac6f7d 1a10792
Author: Yifan Cai <yc...@apache.org>
AuthorDate: Sat Jun 26 22:13:18 2021 -0700
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
.../org/apache/cassandra/dht/BootStrapper.java | 5 ++++-
src/java/org/apache/cassandra/gms/Gossiper.java | 17 +++++++++++-----
.../cassandra/schema/MigrationCoordinator.java | 5 +++++
.../apache/cassandra/service/StorageService.java | 23 ++++++++++++++++++++++
test/unit/org/apache/cassandra/Util.java | 10 +++++++++-
.../operations/InsertUpdateIfConditionTest.java | 4 ++--
.../org/apache/cassandra/gms/GossiperTest.java | 3 ++-
8 files changed, 58 insertions(+), 10 deletions(-)
diff --cc CHANGES.txt
index 4805c3a,9042538..9a0bc72
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,6 -7,8 +12,7 @@@ Merged from 3.0
* Clean transaction log leftovers at the beginning of sstablelevelreset and sstableofflinerelevel (CASSANDRA-12519)
4.0-rc2
+ * Avoid memoizing the wrong min cluster version during upgrades (CASSANDRA-16759)
- * Obfuscate passwords in statements in QueryEvents (CASSANDRA-16669)
* Fix queries on empty partitions with static data (CASSANDRA-16686)
* Keep python driver in artifacts (CASSANDRA-16700)
* Improve AuditLogging documentation and logback.xml(CASSANDRA-16682)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org