You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2023/10/30 21:23:20 UTC
(cassandra) branch trunk updated (4cabe486e1 -> b363568c0f)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 4cabe486e1 Merge branch 'cassandra-5.0' into trunk
add 4ecff92404 Remove deprecated code in Cassandra 1.x and 2.x
new b363568c0f Merge branch 'cassandra-5.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 +
src/java/org/apache/cassandra/auth/Permission.java | 7 ------
src/java/org/apache/cassandra/auth/Resources.java | 29 ++--------------------
src/java/org/apache/cassandra/config/Config.java | 12 ---------
.../cassandra/config/DatabaseDescriptor.java | 7 ------
.../locator/AbstractReplicationStrategy.java | 7 +++---
.../apache/cassandra/locator/TokenMetadata.java | 21 ----------------
.../apache/cassandra/service/StorageService.java | 2 +-
.../cassandra/service/StorageServiceMBean.java | 16 +-----------
src/java/org/apache/cassandra/tools/JMXTool.java | 3 ++-
src/java/org/apache/cassandra/tools/NodeTool.java | 2 --
.../cassandra/tools/nodetool/CfHistograms.java | 29 ----------------------
.../apache/cassandra/tools/nodetool/CfStats.java | 29 ----------------------
test/data/config/version=5.0-alpha1.yml | 3 ---
.../simulator/cluster/OnInstanceRepair.java | 3 ++-
.../cassandra/config/ConfigCompatibilityTest.java | 3 +++
.../cassandra/locator/SimpleStrategyTest.java | 3 ++-
.../cassandra/service/LeaveAndBootstrapTest.java | 12 ++++-----
.../org/apache/cassandra/service/MoveTest.java | 6 ++---
.../cassandra/tools/JMXCompatabilityTest.java | 24 ++++++++++--------
20 files changed, 41 insertions(+), 178 deletions(-)
delete mode 100644 src/java/org/apache/cassandra/tools/nodetool/CfHistograms.java
delete mode 100644 src/java/org/apache/cassandra/tools/nodetool/CfStats.java
---------------------------------------------------------------------
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 sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b363568c0f942f17baee0b8e661c2421e26db363
Merge: 4cabe486e1 4ecff92404
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Mon Oct 30 21:56:07 2023 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/auth/Permission.java | 7 ------
src/java/org/apache/cassandra/auth/Resources.java | 29 ++--------------------
src/java/org/apache/cassandra/config/Config.java | 12 ---------
.../cassandra/config/DatabaseDescriptor.java | 7 ------
.../locator/AbstractReplicationStrategy.java | 7 +++---
.../apache/cassandra/locator/TokenMetadata.java | 21 ----------------
.../apache/cassandra/service/StorageService.java | 2 +-
.../cassandra/service/StorageServiceMBean.java | 16 +-----------
src/java/org/apache/cassandra/tools/JMXTool.java | 3 ++-
src/java/org/apache/cassandra/tools/NodeTool.java | 2 --
.../cassandra/tools/nodetool/CfHistograms.java | 29 ----------------------
.../apache/cassandra/tools/nodetool/CfStats.java | 29 ----------------------
test/data/config/version=5.0-alpha1.yml | 3 ---
.../simulator/cluster/OnInstanceRepair.java | 3 ++-
.../cassandra/config/ConfigCompatibilityTest.java | 3 +++
.../cassandra/locator/SimpleStrategyTest.java | 3 ++-
.../cassandra/service/LeaveAndBootstrapTest.java | 12 ++++-----
.../org/apache/cassandra/service/MoveTest.java | 6 ++---
.../cassandra/tools/JMXCompatabilityTest.java | 24 ++++++++++--------
20 files changed, 41 insertions(+), 178 deletions(-)
diff --cc CHANGES.txt
index f7708acdd8,779d6f2d13..cb3fe71211
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-5.0-alpha2
+5.1
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
+Merged from 5.0:
+ * Remove deprecated code in Cassandra 1.x and 2.x (CASSANDRA-18959)
* ClientRequestSize metrics should not treat CONTAINS restrictions as being equality-based (CASSANDRA-18896)
* Add support for vector search in SAI (CASSANDRA-18715)
* Remove crc_check_chance from CompressionParams (CASSANDRA-18872)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org