natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-6.0' into trunk

This commit is contained in:
Sam Tunnicliffe 2026-05-18 14:33:18 +01:00
parent 5eba832793 6e46e39df8
commit 254a3482ad
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/cassandra-tools.install vendored
View File

@ -6,5 +6,5 @@ tools/bin/sstablemetadata usr/bin
tools/bin/sstableofflinerelevel usr/bin
tools/bin/sstablerepairedset usr/bin
tools/bin/sstablesplit usr/bin
tools/bin/addtocmstool usr/bin
tools/bin/cmsofflinetool usr/bin
tools/bin/offlineclustermetadatadump usr/bin

2
redhat/cassandra.spec
View File

@ -214,7 +214,7 @@ This package contains extra tools for working with Cassandra clusters.
%attr(755,root,root) %{_bindir}/fqltool
%attr(755,root,root) %{_bindir}/generatetokens
%attr(755,root,root) %{_bindir}/hash_password
%attr(755,root,root) %{_bindir}/addtocmstool
%attr(755,root,root) %{_bindir}/cmsofflinetool
%attr(755,root,root) %{_bindir}/offlineclustermetadatadump

3
src/java/org/apache/cassandra/tools/TransformClusterMetadataHelper.java
View File

@ -42,10 +42,7 @@ public class TransformClusterMetadataHelper
public static void main(String ... args) throws IOException
{
if (args.length < 2)
{
System.err.println("Usage: addtocmstool <path to dumped metadata> <ip of host to make CMS> [<serialization version>]");
System.exit(1);
}
String sourceFile = args[0];
Version serializationVersion = NodeVersion.CURRENT.serializationVersion();
if (args.length > 2)