Move -pp/--print-port from NodetoolCommand to per-command Mixin

Patch by Maxim Muzafarov; reviewed by Stefan Miklosovic for CASSANDRA-20790

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

@@ -23,8 +23,10 @@ import java.io.PrintWriter;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.management.InstanceNotFoundException;
@@ -46,6 +48,8 @@ import picocli.CommandLine;
 
 import static com.google.common.base.Throwables.getStackTraceAsString;
 import static org.apache.cassandra.io.util.File.WriteMode.APPEND;
+import static org.apache.cassandra.tools.nodetool.PrintPortMixin.PRINT_PORT_LONG;
+import static org.apache.cassandra.tools.nodetool.PrintPortMixin.PRINT_PORT_SHORT;
 import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;
 
 public class NodeTool
@@ -57,6 +61,20 @@ public class NodeTool
 
     private static final String HISTORYFILE = "nodetool.history";
 
+    /**
+     * Set of subcommand names that accept the {@code -pp/--print-port} options.
+     * These are the commands that declare the option via @Mixin and thus require
+     * relocating the option for backward compatibility in order to be recognized
+     * by picocli when specified before the subcommand name.
+     * <p>
+     * Both calls such as {@code ./nodetool --print-port status}, and
+     * {@code ./nodetool status --print-port} should work as expected.
+     */
+    private static final Set<String> COMMANDS_SUPPORTING_PRINT_PORT_OPTION = Set.of("status", "ring", "netstats",
+                                                                                    "gossipinfo", "getendpoints",
+                                                                                    "failuredetector", "describering",
+                                                                                    "describecluster");
+
     private final INodeProbeFactory nodeProbeFactory;
     private final Output output;
 
@@ -112,7 +130,7 @@ public class NodeTool
                        .setPosixClusteredShortOptionsAllowed(false);
 
             printHistory(args);
-            return commandLine.execute(args);
+            return commandLine.execute(relocatePrintPortOptionsForBackwardCompatibility(args));
         }
         catch (ConfigurationException e)
         {
@@ -220,6 +238,66 @@ public class NodeTool
         output.err.println(getStackTraceAsString(e));
     }
 
+    /**
+     * Rewrites global {@code -pp/--print-port} options that have been moved
+     * to subcommands via @Mixin for backward compatibility. When a user types:
+     * <pre>
+     *   nodetool -pp status
+     *   nodetool --print-port status -r
+     * </pre>
+     * this method rewrites them to:
+     * <pre>
+     *   nodetool status -pp
+     *   nodetool status -r --print-port
+     * </pre>
+     * so that picocli assigns the option to the subcommand that declares it.
+     * <p>
+     * Options that appear after the subcommand name are left untouched:
+     * <pre>
+     *   nodetool status -pp -> unchanged
+     *   nodetool status -pp -r -> unchanged
+     * </pre>
+     */
+    static String[] relocatePrintPortOptionsForBackwardCompatibility(String[] args)
+    {
+        if (args == null || args.length < 2)
+            return args;
+
+        Set<String> relocatable = Set.of(PRINT_PORT_SHORT, PRINT_PORT_LONG);
+
+        int subcommandIdx = -1;
+        for (int i = 0; i < args.length; i++)
+        {
+            if (COMMANDS_SUPPORTING_PRINT_PORT_OPTION.contains(args[i]))
+            {
+                subcommandIdx = i;
+                break;
+            }
+        }
+
+        if (subcommandIdx < 0)
+            return args;
+
+        List<String> before = new ArrayList<>();
+        List<String> toRelocate = new ArrayList<>();
+        for (int i = 0; i < subcommandIdx; i++)
+        {
+            if (relocatable.contains(args[i]))
+                toRelocate.add(args[i]);
+            else
+                before.add(args[i]);
+        }
+
+        if (toRelocate.isEmpty())
+            return args;
+
+        List<String> result = new ArrayList<>(before);
+        result.addAll(Arrays.asList(args).subList(subcommandIdx, args.length));
+        result.addAll(toRelocate);
+
+        return result.toArray(new String[0]);
+    }
+
     private enum CliLayout
     {
         AIRLINE,

src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java

@@ -31,14 +31,18 @@ import org.apache.cassandra.locator.LocationInfoMBean;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(name = "describecluster", description = "Print the name, snitch, partitioner and schema version of a cluster")
-public class DescribeCluster extends WithPortDisplayAbstractCommand
+public class DescribeCluster extends AbstractCommand
 {
     private boolean resolveIp = false;
     private String keyspace = null;
     private Collection<String> joiningNodes, leavingNodes, movingNodes, liveNodes, unreachableNodes;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -63,7 +67,7 @@ public class DescribeCluster extends WithPortDisplayAbstractCommand
 
         // display schema version for each node
         out.println("\tSchema versions:");
-        Map<String, List<String>> schemaVersions = printPort ? probe.getSpProxy().getSchemaVersionsWithPort() : probe.getSpProxy().getSchemaVersions();
+        Map<String, List<String>> schemaVersions = printPortMixin.printPort ? probe.getSpProxy().getSchemaVersionsWithPort() : probe.getSpProxy().getSchemaVersions();
         for (Map.Entry<String, List<String>> entry : schemaVersions.entrySet())
         {
             out.printf("\t\t%s: %s%n%n", entry.getKey(), entry.getValue());

src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java

@@ -23,16 +23,20 @@ import java.io.PrintStream;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Parameters;
 
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 
 @Command(name = "describering", description = "Shows the token ranges info of a given keyspace")
-public class DescribeRing extends WithPortDisplayAbstractCommand
+public class DescribeRing extends AbstractCommand
 {
     @Parameters(description = "The keyspace name", arity = "1")
     private String keyspace = EMPTY;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -41,7 +45,7 @@ public class DescribeRing extends WithPortDisplayAbstractCommand
         out.println("TokenRange: ");
         try
         {
-            for (String tokenRangeString : probe.describeRing(keyspace, printPort))
+            for (String tokenRangeString : probe.describeRing(keyspace, printPortMixin.printPort))
             {
                 out.println("\t" + tokenRangeString);
             }

src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java

@@ -25,14 +25,18 @@ import javax.management.openmbean.TabularData;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 
 @Command(name = "failuredetector", description = "Shows the failure detector information for the cluster")
-public class FailureDetectorInfo extends WithPortDisplayAbstractCommand
+public class FailureDetectorInfo extends AbstractCommand
 {
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
-        TabularData data = probe.getFailureDetectorPhilValues(printPort);
+        TabularData data = probe.getFailureDetectorPhilValues(printPortMixin.printPort);
         probe.output().out.printf("%10s,%16s%n", "Endpoint", "Phi");
         for (Object o : data.keySet())
         {

src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java

@@ -25,13 +25,14 @@ import org.apache.cassandra.tools.NodeProbe;
 import org.apache.cassandra.tools.nodetool.layout.CassandraUsage;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 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 WithPortDisplayAbstractCommand
+public class GetEndpoints extends AbstractCommand
 {
     @CassandraUsage(usage = "<keyspace> <table> <key>", description = "The keyspace, the table, and the partition key for which we need to find the endpoint")
     private List<String> args = new ArrayList<>();
@@ -45,6 +46,9 @@ public class GetEndpoints extends WithPortDisplayAbstractCommand
     @Parameters(index = "2", arity = "0..1", description = "The partition key for which we need to find the endpoint")
     private String key;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -55,7 +59,7 @@ public class GetEndpoints extends WithPortDisplayAbstractCommand
         String table = args.get(1);
         String key = args.get(2);
 
-        if (printPort)
+        if (printPortMixin.printPort)
         {
             for (String endpoint : probe.getEndpointsWithPort(ks, table, key))
             {

src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java

@@ -20,17 +20,21 @@ package org.apache.cassandra.tools.nodetool;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
 @Command(name = "gossipinfo", description = "Shows the gossip information for the cluster")
-public class GossipInfo extends WithPortDisplayAbstractCommand
+public class GossipInfo extends AbstractCommand
 {
     @Option(paramLabel = "resolve_ip", names = { "-r", "--resolve-ip" }, description = "Show node domain names instead of IPs")
     private boolean resolveIp = false;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
-        probe.output().out.println(probe.getGossipInfo(printPort, resolveIp));
+        probe.output().out.println(probe.getGossipInfo(printPortMixin.printPort, resolveIp));
     }
 }

src/java/org/apache/cassandra/tools/nodetool/NetStats.java

@@ -31,16 +31,20 @@ import org.apache.cassandra.streaming.StreamState;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
 @Command(name = "netstats", description = "Print network information on provided host (connecting node by default)")
-public class NetStats extends WithPortDisplayAbstractCommand
+public class NetStats extends AbstractCommand
 {
     @Option(paramLabel = "human_readable",
             names = { "-H", "--human-readable" },
             description = "Display bytes in human readable form, i.e. KiB, MiB, GiB, TiB")
     private boolean humanReadable = false;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     @Override
     public void execute(NodeProbe probe)
     {
@@ -54,11 +58,11 @@ public class NetStats extends WithPortDisplayAbstractCommand
             out.printf("%s %s%n", status.streamOperation.getDescription(), status.planId.toString());
             for (SessionInfo info : status.sessions)
             {
-                out.printf("    %s", InetAddressAndPort.toString(info.peer, printPort));
+                out.printf("    %s", InetAddressAndPort.toString(info.peer, printPortMixin.printPort));
                 // print private IP when it is used
                 if (!info.peer.equals(info.connecting))
                 {
-                    out.printf(" (using %s)", InetAddressAndPort.toString(info.connecting, printPort));
+                    out.printf(" (using %s)", InetAddressAndPort.toString(info.connecting, printPortMixin.printPort));
                 }
                 out.printf("%n");
                 if (!info.receivingSummaries.isEmpty())
@@ -142,7 +146,7 @@ public class NetStats extends WithPortDisplayAbstractCommand
 
         for (ProgressInfo progress : info.getReceivingFiles())
         {
-            out.printf("            %s%n", progress.toString(printPort));
+            out.printf("            %s%n", progress.toString(printPortMixin.printPort));
         }
     }
 
@@ -166,7 +170,7 @@ public class NetStats extends WithPortDisplayAbstractCommand
 
         for (ProgressInfo progress : info.getSendingFiles())
         {
-            out.printf("            %s%n", progress.toString(printPort));
+            out.printf("            %s%n", progress.toString(printPortMixin.printPort));
         }
     }
 }

src/java/org/apache/cassandra/tools/nodetool/NodetoolCommand.java

@@ -20,7 +20,6 @@ package org.apache.cassandra.tools.nodetool;
 
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Model.CommandSpec;
-import picocli.CommandLine.Option;
 import picocli.CommandLine.Spec;
 
 import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
@@ -61,6 +60,7 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          AccordAdmin.class,
                          AlterTopology.class,
                          Assassinate.class,
+                         AsyncProfileCommandGroup.class,
                          AutoRepairStatus.class,
                          Bootstrap.class,
                          CIDRFilteringStats.class,
@@ -71,6 +71,7 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          Compact.class,
                          CompactionHistory.class,
                          CompactionStats.class,
+                         CompressionDictionaryCommandGroup.class,
                          ConsensusMigrationAdmin.class,
                          DataPaths.class,
                          Decommission.Abort.class,
@@ -149,7 +150,6 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          NetStats.class,
                          PauseHandoff.class,
                          ProfileLoad.class,
-                         AsyncProfileCommandGroup.class,
                          ProxyHistograms.class,
                          RangeKeySample.class,
                          Rebuild.class,
@@ -208,7 +208,6 @@ import static org.apache.cassandra.tools.nodetool.Help.printTopCommandUsage;
                          TableStats.class,
                          TopPartitions.class,
                          TpStats.class,
-                         CompressionDictionaryCommandGroup.class,
                          TruncateHints.class,
                          UpdateCIDRGroup.class,
                          UpgradeSSTable.class,
@@ -220,12 +219,6 @@ public class NodetoolCommand implements Runnable
     @Spec
     public CommandSpec spec;
 
-    // TODO CASSANDRA-20790 this option is used only in several commands and should not be the global option.
-    //  It should be pushed down to specific commands to clean up the global hierarchy, while maintaining backwards compatibility.
-    //  Calls such as './nodetool --print-port subcommand', and './nodetool subcommand --print-port' should work as expected.
-    @Option(names = { "-pp", "--print-port" }, description = "Operate in 4.0 mode with hosts disambiguated by port number")
-    public boolean printPort = false;
-
     public void run()
     {
         printTopCommandUsage(spec.commandLine(),

src/java/org/apache/cassandra/tools/nodetool/PrintPortMixin.java

@@ -18,23 +18,14 @@
 
 package org.apache.cassandra.tools.nodetool;
 
-import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine;
 
-/**
- * Abstract class for commands that display endpoints that can be disambiguated by port number. (e.g. gossipinfo, describecluster etc.).
- */
-abstract class WithPortDisplayAbstractCommand extends AbstractCommand
+public class PrintPortMixin
 {
-    @ParentCommand
-    private NodetoolCommand parent;
+    public static final String PRINT_PORT_SHORT = "-pp";
+    public static final String PRINT_PORT_LONG = "--print-port";
 
-    /** See {@link NodetoolCommand#printPort} option. */
-    protected boolean printPort;
-
-    @Override
-    protected boolean shouldConnect()
-    {
-        printPort = parent.printPort;
-        return true;
-    }
+    @CommandLine.Option(names = { PRINT_PORT_SHORT, PRINT_PORT_LONG },
+                        description = "Operate in 4.0 mode with hosts disambiguated by port number")
+    public boolean printPort = false;
 }

src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java

@@ -20,9 +20,9 @@ package org.apache.cassandra.tools.nodetool;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
-import picocli.CommandLine.ParentCommand;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -31,9 +31,6 @@ import static com.google.common.base.Preconditions.checkArgument;
          subcommands = { RemoveNode.Status.class })
 public class RemoveNode extends AbstractCommand
 {
-    @ParentCommand
-    public NodetoolCommand parent;
-
     @Parameters(paramLabel = "nodeId", description = "The ID of the node to remove", arity = "0..1")
     private String nodeId;
 
@@ -64,13 +61,13 @@ public class RemoveNode extends AbstractCommand
     @Command(name = "status", description = "Show status of the current node removal operation")
     public static class Status extends AbstractCommand
     {
-        @ParentCommand
-        private RemoveNode parent;
+        @Mixin
+        private PrintPortMixin printPortMixin = new PrintPortMixin();
 
         @Override
         public void execute(NodeProbe probe)
         {
-            probe.output().out.println("RemovalStatus: " + probe.getRemovalStatus(parent.parent.printPort));
+            probe.output().out.println("RemovalStatus: " + probe.getRemovalStatus(printPortMixin.printPort));
         }
     }
 }

src/java/org/apache/cassandra/tools/nodetool/Ring.java

@@ -34,13 +34,14 @@ import org.apache.cassandra.locator.EndpointSnitchInfoMBean;
 import org.apache.cassandra.tools.NodeProbe;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
 import static java.lang.String.format;
 
 @Command(name = "ring", description = "Print information about the token ring")
-public class Ring extends WithPortDisplayAbstractCommand
+public class Ring extends AbstractCommand
 {
     @Parameters(description = "Specify a keyspace for accurate ownership information (topology awareness)", index = "0", arity = "0..1")
     private String keyspace = null;
@@ -48,6 +49,9 @@ public class Ring extends WithPortDisplayAbstractCommand
     @Option(paramLabel = "resolve_ip", names = { "-r", "--resolve-ip" }, description = "Show node domain names instead of IPs")
     private boolean resolveIp = false;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     private PrintStream out;
     private EndpointSnitchInfoMBean epSnitchInfo;
     private Collection<String> liveNodes, deadNodes, joiningNodes, leavingNodes, movingNodes;
@@ -176,7 +180,7 @@ public class Ring extends WithPortDisplayAbstractCommand
 
             String load = loadMap.getOrDefault(endpoint, "?");
             String owns = stat.owns != null && showEffectiveOwnership? new DecimalFormat("##0.00%").format(stat.owns) : "?";
-            out.printf(format, stat.ipOrDns(printPort), rack, status, state, load, owns, stat.token);
+            out.printf(format, stat.ipOrDns(printPortMixin.printPort), rack, status, state, load, owns, stat.token);
         }
         out.println();
     }

src/java/org/apache/cassandra/tools/nodetool/Status.java

@@ -44,13 +44,14 @@ import org.apache.cassandra.tools.nodetool.formatter.TableBuilder;
 import org.apache.cassandra.utils.LocalizeString;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
 import static java.util.stream.Collectors.toMap;
 
 @Command(name = "status", description = "Print cluster information (state, load, IDs, ...)")
-public class Status extends WithPortDisplayAbstractCommand
+public class Status extends AbstractCommand
 {
     @Parameters(description = "The keyspace name", arity = "0..1")
     private String keyspace = null;
@@ -71,6 +72,9 @@ public class Status extends WithPortDisplayAbstractCommand
             description = "Sorting order: 'asc' for ascending, 'desc' for descending.")
     private SortOrder sortOrder = null;
 
+    @Mixin
+    private PrintPortMixin printPortMixin = new PrintPortMixin();
+
     private boolean isTokenPerNode = true;
     private Collection<String> joiningNodes, leavingNodes, movingNodes, liveNodes, unreachableNodes;
     private Map<String, String> loadMap, hostIDMap;
@@ -167,7 +171,7 @@ public class Status extends WithPortDisplayAbstractCommand
                 List<HostStatWithPort> tokens = hostToTokens.get(endpoint);
 
                 HostStatWithPort hostStatWithPort = tokens.get(0);
-                String epDns = hostStatWithPort.ipOrDns(printPort);
+                String epDns = hostStatWithPort.ipOrDns(printPortMixin.printPort);
                 List<Object> nodeData = addNode(epDns, endpoint, owns, hostStatWithPort, tokens.size(), hasEffectiveOwns);
                 data.put(epDns, nodeData);
             }

test/distributed/org/apache/cassandra/distributed/test/GetEndpointsTest.java

@@ -33,6 +33,7 @@ import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.tools.ToolRunner;
 import org.apache.cassandra.utils.FBUtilities;
 
+import static org.apache.cassandra.tools.nodetool.PrintPortMixin.PRINT_PORT_SHORT;
 import static org.junit.Assert.assertEquals;
 
 public class GetEndpointsTest extends TestBaseImpl
@@ -45,7 +46,7 @@ public class GetEndpointsTest extends TestBaseImpl
         {
             for (IInvokableInstance i : cluster)
             {
-                ToolRunner.ToolResult tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, "-pp", "getendpoints", "system", "compaction_history", "7d431310-43c9-11ef-bd50-53ff742309a9");
+                ToolRunner.ToolResult tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, PRINT_PORT_SHORT, "getendpoints", "system", "compaction_history", "7d431310-43c9-11ef-bd50-53ff742309a9");
                 tool.asserts().success();
                 List<String> endpoints = tool.getStdout().trim().lines().collect(Collectors.toList());
                 assertEquals(1, endpoints.size());
@@ -64,13 +65,13 @@ public class GetEndpointsTest extends TestBaseImpl
             ToolRunner.ToolResult tool;
             for (IInvokableInstance i : cluster)
             {
-                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, "-pp", "getendpoints", "system", "local_metadata_log", "1");
+                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, PRINT_PORT_SHORT, "getendpoints", "system", "local_metadata_log", "1");
                 tool.asserts().success();
                 List<String> systemKsEndpoints = tool.getStdout().trim().lines().collect(Collectors.toList());
                 assertEquals(1, systemKsEndpoints.size());
                 i.runOnInstance(() -> assertEquals(FBUtilities.getBroadcastAddressAndPort().getHostAddressAndPort(), systemKsEndpoints.get(0)));
 
-                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, "-pp", "getendpoints", "system_cluster_metadata", "distributed_metadata_log", "1");
+                tool = ToolRunner.invokeNodetoolJvmDtestIsolated(i, PRINT_PORT_SHORT, "getendpoints", "system_cluster_metadata", "distributed_metadata_log", "1");
                 tool.asserts().success();
                 List<String> scmEndpoints = tool.getStdout().trim().lines().collect(Collectors.toList());
                 assertEquals(1, scmEndpoints.size());

test/resources/nodetool/help/abortbootstrap

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortbootstrap [--ip <ip>]
                 [--node <node_id>]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/abortdecommission

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortdecommission
                 [--node <nodeId>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/abortmove

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortmove [--node <nodeId>]
 
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/abortremovenode

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] abortremovenode
                 [--node <nodeId>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/accord

@@ -3,23 +3,23 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord describe
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_stale [--]
                 <nodeIds>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_rejoining [--]
                 <nodeIds>
@@ -31,9 +31,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/accord$describe

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord describe
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/accord$mark_rejoining

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_rejoining [--]
                 <nodeIds>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/accord$mark_stale

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] accord mark_stale [--]
                 <nodeIds>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/altertopology

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] altertopology [--] <args>
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/assassinate

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] assassinate [--] <ip_address>
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/autorepairstatus

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] autorepairstatus
                 [(-t <repairType> | --repair-type <repairType>)]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/bootstrap

@@ -3,12 +3,12 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] bootstrap <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] bootstrap resume
                 [(-f | --force)]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/bootstrap$resume

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] bootstrap resume
                 [(-f | --force)]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cidrfilteringstats

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cidrfilteringstats
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cleanup

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cleanup
                 [(-j <jobs> | --jobs <jobs>)] [--] [<keyspace> <tables>...]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/clearsnapshot

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] clearsnapshot [--all]
                 [--older-than <older_than>]
@@ -28,9 +28,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/clientstats

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] clientstats [--all]
                 [--by-protocol] [--clear-history] [--client-options] [--verbose]
@@ -27,9 +27,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms

@@ -3,57 +3,57 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms describe
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms initialize
                 [(-i <ignored_endpoints> | --ignore <ignored_endpoints>)...]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms reconfigure
                 [(-c | --cancel)] [(-r | --resume)] [--status] [--] [<replication
                 factor>] or <datacenter>:<replication_factor> ...
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms snapshot
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms unregister [--] <nodeId>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms abortinitialization
                 [--initiator <initiator>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumpdirectory [--tokens]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumplog
                 [--end <endEpoch>] [--start <startEpoch>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms resumedropaccordtable
                 [--] <tableId>
@@ -65,9 +65,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$abortinitialization

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms abortinitialization
                 [--initiator <initiator>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$describe

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms describe
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$dumpdirectory

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumpdirectory [--tokens]
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$dumplog

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms dumplog
                 [--end <endEpoch>] [--start <startEpoch>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$initialize

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms initialize
                 [(-i <ignored_endpoints> | --ignore <ignored_endpoints>)...]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$reconfigure

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms reconfigure
                 [(-c | --cancel)] [(-r | --resume)] [--status] [--] [<replication
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$resumedropaccordtable

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms resumedropaccordtable
                 [--] <tableId>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$snapshot

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms snapshot
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/cms$unregister

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] cms unregister [--] <nodeId>
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compact

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compact
                 [(-et <end_token> | --end-token <end_token>)]
@@ -34,9 +34,6 @@ OPTIONS
         --partition <partition_key>
             String representation of the partition key
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compactionhistory

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compactionhistory
                 [(-F <format> | --format <format>)] [(-H | --human-readable)]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compactionstats

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compactionstats
                 [(-H | --human-readable)] [(-V | --vtable)]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compressiondictionary

@@ -3,13 +3,13 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary
                 <command> [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary train
                 [(-f | --force)] [--max-dict-size <trainingMaxDictionarySize>]
@@ -17,25 +17,25 @@ SYNOPSIS
                 <table>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary list
                 [--] <keyspace> <table>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary export
                 [(-i <dictId> | --id <dictId>)] [--] <keyspace> <table> <dictionaryPath>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary import
                 [--] <dictionaryPath>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary cleanup
                 [(-d | --dry)]
@@ -47,9 +47,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compressiondictionary$cleanup

@@ -6,7 +6,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary cleanup
                 [(-d | --dry)]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compressiondictionary$export

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary export
                 [(-i <dictId> | --id <dictId>)] [--] <keyspace> <table> <dictionaryPath>
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compressiondictionary$import

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary import
                 [--] <dictionaryPath>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compressiondictionary$list

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary list
                 [--] <keyspace> <table>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/compressiondictionary$train

@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] compressiondictionary train
                 [(-f | --force)] [--max-dict-size <trainingMaxDictionarySize>]
@@ -36,9 +36,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/consensus_admin

@@ -4,13 +4,13 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] consensus_admin <command>
                 [<args>]
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin begin-migration
@@ -19,7 +19,7 @@ SYNOPSIS
                 <tables>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin finish-migration
@@ -28,7 +28,7 @@ SYNOPSIS
                 <tables>
 
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] consensus_admin list
                 [(-f <format> | --format <format>)] [--] <keyspace> <tables>
@@ -40,9 +40,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/consensus_admin$begin-migration

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin begin-migration
@@ -22,9 +22,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/consensus_admin$finish-migration

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)]
                 consensus_admin finish-migration
@@ -22,9 +22,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/consensus_admin$list

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] consensus_admin list
                 [(-f <format> | --format <format>)] [--] <keyspace> <tables>
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/datapaths

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] datapaths
                 [(-F <format> | --format <format>)] [--] [<keyspace.table>...]
@@ -19,9 +19,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/decommission

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] decommission [(-f | --force)]
 
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/describecluster

@@ -4,9 +4,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] describecluster
+                [(-pp | --print-port)]
 
 OPTIONS
         -h <host>, --host <host>

test/resources/nodetool/help/describering

@@ -3,9 +3,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
-                [(-u <username> | --username <username>)] describering [--] <keyspace>
+                [(-u <username> | --username <username>)] describering
+                [(-pp | --print-port)] [--] <keyspace>
 
 OPTIONS
         -h <host>, --host <host>

test/resources/nodetool/help/disableauditlog

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disableauditlog
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disableautocompaction

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disableautocompaction [--]
                 [<keyspace> <tables>...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disablebackup

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablebackup
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disablebinary

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablebinary
                 [(-f | --force)]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disablefullquerylog

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablefullquerylog
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disablegossip

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablegossip
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disablehandoff

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablehandoff
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disablehintsfordc

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disablehintsfordc [--]
                 <datacenter>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/disableoldprotocolversions

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] disableoldprotocolversions
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/drain

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] drain
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/dropcidrgroup

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] dropcidrgroup [--] <cidrGroup>
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enableauditlog

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enableauditlog
                 [--archive-command <archive_command>] [--blocking <blocking>]
@@ -73,9 +73,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enableautocompaction

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enableautocompaction [--]
                 [<keyspace> <tables>...]
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enablebackup

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablebackup
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enablebinary

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablebinary
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enablefullquerylog

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablefullquerylog
                 [--archive-command <archive_command>] [--blocking <blocking>]
@@ -45,9 +45,6 @@ OPTIONS
             Path to store the full query log at. Will have it's contents
             recursively deleted.
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enablegossip

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablegossip
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enablehandoff

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablehandoff
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enablehintsfordc

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enablehintsfordc [--]
                 <datacenter>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/enableoldprotocolversions

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] enableoldprotocolversions
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/failuredetector

@@ -4,9 +4,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] failuredetector
+                [(-pp | --print-port)]
 
 OPTIONS
         -h <host>, --host <host>

test/resources/nodetool/help/flush

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] flush [--] [<keyspace>
                 <tables>...]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/forcecompact

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] forcecompact [--] [<keyspace>
                 <table> <keys>]
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/garbagecollect

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] garbagecollect
                 [(-g <granularity> | --granularity <granularity>)]
@@ -25,9 +25,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/gcstats

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] gcstats
                 [(-F <format> | --format <format>)] [(-H | --human-readable)]
@@ -21,9 +21,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getauditlog

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getauditlog
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getauthcacheconfig

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getauthcacheconfig
                 [--cache-name <cache-name>]
@@ -18,9 +18,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getautorepairconfig

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getautorepairconfig
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getbatchlogreplaythrottle

@@ -5,7 +5,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getbatchlogreplaythrottle
 
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getcidrgroupsofip

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcidrgroupsofip [--]
                 <ip_address>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getcolumnindexsize

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcolumnindexsize
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getcompactionthreshold

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcompactionthreshold [--]
                 <keyspace> <table>
@@ -16,9 +16,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getcompactionthroughput

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getcompactionthroughput
                 [(-d | --precise-mib)]
@@ -20,9 +20,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getconcurrency

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getconcurrency [--]
                 <stage-names>
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getconcurrentcompactors

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getconcurrentcompactors
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getconcurrentviewbuilders

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getconcurrentviewbuilders
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getdefaultrf

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getdefaultrf
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getendpoints

@@ -3,10 +3,10 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
-                [(-u <username> | --username <username>)] getendpoints [--] <keyspace>
-                <table> <key>
+                [(-u <username> | --username <username>)] getendpoints
+                [(-pp | --print-port)] [--] <keyspace> <table> <key>
 
 OPTIONS
         -h <host>, --host <host>

test/resources/nodetool/help/getfullquerylog

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getfullquerylog
 
@@ -15,9 +15,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getguardrailsconfig

@@ -4,7 +4,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getguardrailsconfig
                 [(-c <guardrailCategory> | --category <guardrailCategory>)] [--expand]
@@ -25,9 +25,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getinterdcstreamthroughput

@@ -6,7 +6,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getinterdcstreamthroughput
                 [(-d | --precise-mbit)] [(-e | --entire-sstable-throughput)]
@@ -29,9 +29,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getlogginglevels

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getlogginglevels
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password
 

test/resources/nodetool/help/getmaxhintwindow

@@ -3,7 +3,7 @@ NAME
 
 SYNOPSIS
         nodetool [(-h <host> | --host <host>)] [(-p <port> | --port <port>)]
-                [(-pp | --print-port)] [(-pw <password> | --password <password>)]
+                [(-pw <password> | --password <password>)]
                 [(-pwf <passwordFilePath> | --password-file <passwordFilePath>)]
                 [(-u <username> | --username <username>)] getmaxhintwindow
 
@@ -14,9 +14,6 @@ OPTIONS
         -p <port>, --port <port>
             Remote jmx agent port number
 
-        -pp, --print-port
-            Operate in 4.0 mode with hosts disambiguated by port number
-
         -pw <password>, --password <password>
             Remote jmx agent password