You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/06/16 16:58:38 UTC
[cassandra] branch trunk updated (db7f15d -> c3a468c)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from db7f15d Clarify in the documentation that "Cassandra must be stopped" applies to the source cluster for sstableloader
new e97b8fb Clean transaction log leftovers at the beginning of sstablelevelreset and sstableofflinerelevel
new d844b4b Merge branch 'cassandra-3.0' into cassandra-3.11
new 2493ad1 Merge branch 'cassandra-3.11' into cassandra-4.0.0
new 2573b08 Merge branch 'cassandra-4.0.0' into cassandra-4.0
new c3a468c Merge branch 'cassandra-4.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 ++
.../org/apache/cassandra/tools/SSTableLevelResetter.java | 12 +++++++++++-
.../org/apache/cassandra/tools/SSTableOfflineRelevel.java | 9 +++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
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 ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c3a468c6691a127b3d611270edea0b218bedc3b5
Merge: db7f15d 2573b08
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Wed Jun 16 17:56:43 2021 +0100
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 2 ++
.../org/apache/cassandra/tools/SSTableLevelResetter.java | 12 +++++++++++-
.../org/apache/cassandra/tools/SSTableOfflineRelevel.java | 9 +++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 03a6f4a,7e0c1a9..cc2e526
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,11 +1,14 @@@
-4.0.1
+4.1
+ * Add a system property to set hostId if not yet initialized (CASSANDRA-14582)
+ * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
+Merged from 4.0:
+ * Obfuscate passwords in statements in QueryEvents (CASSANDRA-16669)
* Cleanup dependency scopes (CASSANDRA-16704)
* Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707)
+ Merged from 3.0:
+ * Clean transaction log leftovers at the beginning of sstablelevelreset and sstableofflinerelevel (CASSANDRA-12519)
4.0-rc2
- * 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