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 3fad7604162478c0fdc2488d9aa944c810bca73d
Merge: 7666b19ac6 f51c29c196
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Sat Jul 25 09:55:25 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 src/java/org/apache/cassandra/tools/nodetool/GetReplicas.java | 4 ++--
 test/resources/nodetool/help/getendpoints                     | 2 +-
 test/resources/nodetool/help/getreplicas                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --cc src/java/org/apache/cassandra/tools/nodetool/GetReplicas.java
index 0f9e09810d,71c9729998..5c91d20a7d
--- a/src/java/org/apache/cassandra/tools/nodetool/GetReplicas.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/GetReplicas.java
@@@ -32,19 -31,19 +32,19 @@@ import picocli.CommandLine.Parameters
  import static com.google.common.base.Preconditions.checkArgument;
  import static org.apache.cassandra.tools.nodetool.CommandUtils.concatArgs;
  
 -@Command(name = "getendpoints", description = "Print the end points that owns 
the key")
 -public class GetEndpoints extends AbstractCommand
 +@Command(name = "getreplicas", description = "Print the replicas that own the 
key")
 +public class GetReplicas extends AbstractCommand
  {
-     @CassandraUsage(usage = "<keyspace> <table> <key>", description = "The 
keyspace, the table, and the partition key for which we need to find the 
replica")
 -    @CassandraUsage(usage = "<keyspace> <table> <key>", description = "The 
keyspace, the table, and the partition key for which we need to find the 
endpoint (e.g., pk1:pk2:pk3 for compound keys)")
++    @CassandraUsage(usage = "<keyspace> <table> <key>", description = "The 
keyspace, the table, and the partition key for which we need to find the 
replica (e.g., pk1:pk2:pk3 for compound keys)")
      private List<String> args = new ArrayList<>();
  
 -    @Parameters(index = "0", arity = "0..1", description = "The keyspace for 
which we need to find the endpoint")
 +    @Parameters(index = "0", arity = "0..1", description = "The keyspace for 
which we need to find the replica")
      private String keyspace;
  
 -    @Parameters(index = "1", arity = "0..1", description = "The table for 
which we need to find the endpoint")
 +    @Parameters(index = "1", arity = "0..1", description = "The table for 
which we need to find the replica")
      private String table;
  
-     @Parameters(index = "2", arity = "0..1", description = "The partition key 
for which we need to find the replica")
 -    @Parameters(index = "2", arity = "0..1", description = "The partition key 
for which we need to find the endpoint (e.g., pk1:pk2:pk3 for compound keys)")
++    @Parameters(index = "2", arity = "0..1", description = "The partition key 
for which we need to find the replica (e.g., pk1:pk2:pk3 for compound keys)")
      private String key;
  
      @Mixin
diff --cc test/resources/nodetool/help/getendpoints
index 6daeb4c0c4,92e411cd4e..5c223feb21
--- a/test/resources/nodetool/help/getendpoints
+++ b/test/resources/nodetool/help/getendpoints
@@@ -35,4 -34,4 +35,4 @@@ OPTION
  
          <keyspace> <table> <key>
              The keyspace, the table, and the partition key for which we need 
to
-             find the replica
 -            find the endpoint (e.g., pk1:pk2:pk3 for compound keys)
++            find the replica (e.g., pk1:pk2:pk3 for compound keys)
diff --cc test/resources/nodetool/help/getreplicas
index 259aebc748,92e411cd4e..bbe5c109e1
--- a/test/resources/nodetool/help/getreplicas
+++ b/test/resources/nodetool/help/getreplicas
@@@ -34,4 -34,4 +34,4 @@@ OPTION
  
          <keyspace> <table> <key>
              The keyspace, the table, and the partition key for which we need 
to
-             find the replica
 -            find the endpoint (e.g., pk1:pk2:pk3 for compound keys)
++            find the replica (e.g., pk1:pk2:pk3 for compound keys)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to