Merge branch 'cassandra-6.0' into trunk

Author: beobal

debian/cassandra-tools.install

@@ -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

redhat/cassandra.spec

@@ -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
 
 

src/java/org/apache/cassandra/tools/TransformClusterMetadataHelper.java

@@ -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)