Repository: cassandra Updated Branches: refs/heads/trunk 45c0f860f -> f415b736d
Upgrade airline dependency to 0.7 patch by Tomas Repik; reviewed by Stefan Podkowinski for CASSANDRA-12994 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f415b736 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f415b736 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f415b736 Branch: refs/heads/trunk Commit: f415b736d6cdbfcf71ffeaa4ebbdce406584ad25 Parents: 45c0f86 Author: Stefan Podkowinski <s.podkowin...@gmail.com> Authored: Fri Jun 2 18:58:35 2017 +0200 Committer: Stefan Podkowinski <s.podkowin...@gmail.com> Committed: Sat Jul 1 12:24:22 2017 +0200 ---------------------------------------------------------------------- build.xml | 2 +- lib/airline-0.6.jar | Bin 86653 -> 0 bytes lib/airline-0.7.jar | Bin 0 -> 85912 bytes src/java/org/apache/cassandra/tools/NodeTool.java | 2 +- .../cassandra/tools/nodetool/Assassinate.java | 4 ++-- .../cassandra/tools/nodetool/BootstrapResume.java | 2 +- .../cassandra/tools/nodetool/CfHistograms.java | 2 +- .../apache/cassandra/tools/nodetool/CfStats.java | 2 +- .../apache/cassandra/tools/nodetool/Cleanup.java | 6 +++--- .../cassandra/tools/nodetool/ClearSnapshot.java | 6 +++--- .../apache/cassandra/tools/nodetool/Compact.java | 6 +++--- .../tools/nodetool/CompactionHistory.java | 4 ++-- .../cassandra/tools/nodetool/CompactionStats.java | 4 ++-- .../cassandra/tools/nodetool/Decommission.java | 4 ++-- .../cassandra/tools/nodetool/DescribeCluster.java | 2 +- .../cassandra/tools/nodetool/DescribeRing.java | 4 ++-- .../tools/nodetool/DisableAutoCompaction.java | 4 ++-- .../cassandra/tools/nodetool/DisableBackup.java | 2 +- .../cassandra/tools/nodetool/DisableBinary.java | 2 +- .../cassandra/tools/nodetool/DisableGossip.java | 2 +- .../cassandra/tools/nodetool/DisableHandoff.java | 2 +- .../tools/nodetool/DisableHintsForDC.java | 4 ++-- .../org/apache/cassandra/tools/nodetool/Drain.java | 2 +- .../tools/nodetool/EnableAutoCompaction.java | 4 ++-- .../cassandra/tools/nodetool/EnableBackup.java | 2 +- .../cassandra/tools/nodetool/EnableBinary.java | 2 +- .../cassandra/tools/nodetool/EnableGossip.java | 2 +- .../cassandra/tools/nodetool/EnableHandoff.java | 2 +- .../cassandra/tools/nodetool/EnableHintsForDC.java | 4 ++-- .../tools/nodetool/FailureDetectorInfo.java | 2 +- .../org/apache/cassandra/tools/nodetool/Flush.java | 4 ++-- .../cassandra/tools/nodetool/GarbageCollect.java | 6 +++--- .../apache/cassandra/tools/nodetool/GcStats.java | 2 +- .../tools/nodetool/GetCompactionThreshold.java | 4 ++-- .../tools/nodetool/GetCompactionThroughput.java | 2 +- .../tools/nodetool/GetConcurrentCompactors.java | 2 +- .../cassandra/tools/nodetool/GetEndpoints.java | 4 ++-- .../tools/nodetool/GetInterDCStreamThroughput.java | 2 +- .../cassandra/tools/nodetool/GetLoggingLevels.java | 2 +- .../cassandra/tools/nodetool/GetMaxHintWindow.java | 2 +- .../cassandra/tools/nodetool/GetSSTables.java | 6 +++--- .../tools/nodetool/GetStreamThroughput.java | 2 +- .../cassandra/tools/nodetool/GetTimeout.java | 4 ++-- .../tools/nodetool/GetTraceProbability.java | 2 +- .../cassandra/tools/nodetool/GossipInfo.java | 2 +- .../org/apache/cassandra/tools/nodetool/Info.java | 4 ++-- .../tools/nodetool/InvalidateCounterCache.java | 2 +- .../tools/nodetool/InvalidateKeyCache.java | 2 +- .../tools/nodetool/InvalidateRowCache.java | 2 +- .../org/apache/cassandra/tools/nodetool/Join.java | 2 +- .../cassandra/tools/nodetool/ListSnapshots.java | 2 +- .../org/apache/cassandra/tools/nodetool/Move.java | 4 ++-- .../apache/cassandra/tools/nodetool/NetStats.java | 4 ++-- .../cassandra/tools/nodetool/PauseHandoff.java | 2 +- .../cassandra/tools/nodetool/ProxyHistograms.java | 2 +- .../cassandra/tools/nodetool/RangeKeySample.java | 2 +- .../apache/cassandra/tools/nodetool/Rebuild.java | 6 +++--- .../cassandra/tools/nodetool/RebuildIndex.java | 4 ++-- .../apache/cassandra/tools/nodetool/Refresh.java | 4 ++-- .../tools/nodetool/RefreshSizeEstimates.java | 2 +- .../cassandra/tools/nodetool/ReloadTriggers.java | 2 +- .../cassandra/tools/nodetool/RelocateSSTables.java | 6 +++--- .../cassandra/tools/nodetool/RemoveNode.java | 4 ++-- .../apache/cassandra/tools/nodetool/Repair.java | 6 +++--- .../cassandra/tools/nodetool/RepairAdmin.java | 4 ++-- .../cassandra/tools/nodetool/ReplayBatchlog.java | 2 +- .../cassandra/tools/nodetool/ResetLocalSchema.java | 2 +- .../cassandra/tools/nodetool/ResumeHandoff.java | 2 +- .../org/apache/cassandra/tools/nodetool/Ring.java | 6 +++--- .../org/apache/cassandra/tools/nodetool/Scrub.java | 6 +++--- .../cassandra/tools/nodetool/SetCacheCapacity.java | 4 ++-- .../tools/nodetool/SetCacheKeysToSave.java | 4 ++-- .../tools/nodetool/SetCompactionThreshold.java | 4 ++-- .../tools/nodetool/SetCompactionThroughput.java | 4 ++-- .../tools/nodetool/SetConcurrentCompactors.java | 4 ++-- .../nodetool/SetHintedHandoffThrottleInKB.java | 4 ++-- .../tools/nodetool/SetInterDCStreamThroughput.java | 4 ++-- .../cassandra/tools/nodetool/SetLoggingLevel.java | 4 ++-- .../cassandra/tools/nodetool/SetMaxHintWindow.java | 4 ++-- .../tools/nodetool/SetStreamThroughput.java | 4 ++-- .../cassandra/tools/nodetool/SetTimeout.java | 4 ++-- .../tools/nodetool/SetTraceProbability.java | 4 ++-- .../apache/cassandra/tools/nodetool/Snapshot.java | 6 +++--- .../apache/cassandra/tools/nodetool/Status.java | 6 +++--- .../cassandra/tools/nodetool/StatusBackup.java | 2 +- .../cassandra/tools/nodetool/StatusBinary.java | 2 +- .../cassandra/tools/nodetool/StatusGossip.java | 2 +- .../cassandra/tools/nodetool/StatusHandoff.java | 2 +- .../org/apache/cassandra/tools/nodetool/Stop.java | 6 +++--- .../cassandra/tools/nodetool/StopDaemon.java | 2 +- .../cassandra/tools/nodetool/TableHistograms.java | 4 ++-- .../cassandra/tools/nodetool/TableStats.java | 6 +++--- .../cassandra/tools/nodetool/TopPartitions.java | 6 +++--- .../apache/cassandra/tools/nodetool/TpStats.java | 4 ++-- .../cassandra/tools/nodetool/TruncateHints.java | 4 ++-- .../cassandra/tools/nodetool/UpgradeSSTable.java | 6 +++--- .../apache/cassandra/tools/nodetool/Verify.java | 6 +++--- .../apache/cassandra/tools/nodetool/Version.java | 2 +- .../cassandra/tools/nodetool/ViewBuildStatus.java | 4 ++-- .../apache/cassandra/stress/CompactionStress.java | 2 +- 100 files changed, 168 insertions(+), 168 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 965b71d..3de3a59 100644 --- a/build.xml +++ b/build.xml @@ -418,7 +418,7 @@ <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.0" /> <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3" /> <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" /> - <dependency groupId="io.airlift" artifactId="airline" version="0.6" /> + <dependency groupId="io.airlift" artifactId="airline" version="0.7" /> <dependency groupId="io.netty" artifactId="netty-all" version="4.0.44.Final" /> <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" /> <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/lib/airline-0.6.jar ---------------------------------------------------------------------- diff --git a/lib/airline-0.6.jar b/lib/airline-0.6.jar deleted file mode 100644 index a35ae79..0000000 Binary files a/lib/airline-0.6.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/lib/airline-0.7.jar ---------------------------------------------------------------------- diff --git a/lib/airline-0.7.jar b/lib/airline-0.7.jar new file mode 100644 index 0000000..b5a7b01 Binary files /dev/null and b/lib/airline-0.7.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index 22c6b09..31a369d 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -28,7 +28,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Throwables; import com.google.common.collect.*; -import io.airlift.command.*; +import io.airlift.airline.*; import org.apache.cassandra.locator.EndpointSnitchInfoMBean; import org.apache.cassandra.tools.nodetool.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java b/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java index 56fec44..a075ded 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Assassinate.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.net.UnknownHostException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java b/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java index bb47e10..7be9173 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java +++ b/src/java/org/apache/cassandra/tools/nodetool/BootstrapResume.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.io.IOError; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/CfHistograms.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/CfHistograms.java b/src/java/org/apache/cassandra/tools/nodetool/CfHistograms.java index 69d3b4a..8fdf803 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CfHistograms.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CfHistograms.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; /** * @deprecated use TableHistograms http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/CfStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/CfStats.java b/src/java/org/apache/cassandra/tools/nodetool/CfStats.java index 15c72ba..2d27ea0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CfStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CfStats.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; /** * @deprecated use TableStats http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java b/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java index 4102846..6567863 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Cleanup.java @@ -17,13 +17,13 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; -import io.airlift.command.Option; +import io.airlift.airline.Option; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java b/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java index 7167bd9..10a8117 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ClearSnapshot.java @@ -20,9 +20,9 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.collect.Iterables.toArray; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.join; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Compact.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Compact.java b/src/java/org/apache/cassandra/tools/nodetool/Compact.java index ef10a83..7278ead 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Compact.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Compact.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java b/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java index 8d24845..8896db0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CompactionHistory.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; import org.apache.cassandra.tools.nodetool.stats.CompactionHistoryHolder; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java b/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java index 4fd0423..5eb5b24 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.db.compaction.CompactionManagerMBean; import org.apache.cassandra.db.compaction.OperationType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Decommission.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Decommission.java b/src/java/org/apache/cassandra/tools/nodetool/Decommission.java index 294fe07..0e58687 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Decommission.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Decommission.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java index 81dee20..9bf3990 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java @@ -18,7 +18,7 @@ package org.apache.cassandra.tools.nodetool; import static java.lang.String.format; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java index a120ffe..2a73c2a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java b/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java index 4d35ded..b9fc7d6 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableAutoCompaction.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java b/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java index 74e7f50..4b0bfbe 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableBackup.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java b/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java index dee319b..463f2b0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableBinary.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java b/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java index 32448c9..6f950bb 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableGossip.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java index 11cd754..d7ec35f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableHandoff.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java b/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java index 7072318..d65c70b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DisableHintsForDC.java @@ -20,8 +20,8 @@ package org.apache.cassandra.tools.nodetool; import java.util.ArrayList; import java.util.List; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Drain.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Drain.java b/src/java/org/apache/cassandra/tools/nodetool/Drain.java index 5562e6d..eaa537a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Drain.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Drain.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.io.IOException; import java.util.concurrent.ExecutionException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java b/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java index c758df8..795ab13 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableAutoCompaction.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java b/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java index 4847fa5..d1773d9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableBackup.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java b/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java index f1d5d9c..506945f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableBinary.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java b/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java index 16a9f4b..900c427 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableGossip.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java index 149c0fc..bccf7e7 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableHandoff.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java b/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java index 1979ebd..97e40e0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java +++ b/src/java/org/apache/cassandra/tools/nodetool/EnableHintsForDC.java @@ -20,8 +20,8 @@ package org.apache.cassandra.tools.nodetool; import java.util.ArrayList; import java.util.List; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java index 3c0303d..b3ffb6d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java +++ b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Flush.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Flush.java b/src/java/org/apache/cassandra/tools/nodetool/Flush.java index f768615..c83e420 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Flush.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Flush.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java b/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java index 37daf09..5847a91 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GarbageCollect.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GcStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GcStats.java b/src/java/org/apache/cassandra/tools/nodetool/GcStats.java index dd38fe7..07ae6d9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GcStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GcStats.java @@ -20,7 +20,7 @@ package org.apache.cassandra.tools.nodetool; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; -import io.airlift.command.Command; +import io.airlift.airline.Command; @Command(name = "gcstats", description = "Print GC Statistics") public class GcStats extends NodeToolCmd http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java index 6c629de..589b1b3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThreshold.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java index c3af184..a7df4d1 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetCompactionThroughput.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java index 8f4d5e4..6aa4d8b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetConcurrentCompactors.java @@ -18,7 +18,7 @@ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java index 49d2148..922ae26 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.net.InetAddress; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java index 4c354c0..039814e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetInterDCStreamThroughput.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java b/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java index 7ce0017..90d6817 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetLoggingLevels.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.util.Map; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java b/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java index 280d70c..7bc1a30 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetMaxHintWindow.java @@ -18,7 +18,7 @@ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java b/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java index 849ad94..e43c2bf 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetSSTables.java @@ -18,13 +18,13 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; -import io.airlift.command.Option; +import io.airlift.airline.Option; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java index 437eb54..b76d14b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetStreamThroughput.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetTimeout.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetTimeout.java b/src/java/org/apache/cassandra/tools/nodetool/GetTimeout.java index b12c9a7..6c9b541 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetTimeout.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetTimeout.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java b/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java index 3940790..374ab2c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetTraceProbability.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java index 2acfcf1..1b4b979 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Info.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Info.java b/src/java/org/apache/cassandra/tools/nodetool/Info.java index 1aa113d..6ff5037 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Info.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Info.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.lang.management.MemoryUsage; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java index a5f0ebc..aef77bd 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateCounterCache.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java index 70abd53..cfe7d2f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateKeyCache.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java b/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java index 149f80b..7357e27 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java +++ b/src/java/org/apache/cassandra/tools/nodetool/InvalidateRowCache.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Join.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Join.java b/src/java/org/apache/cassandra/tools/nodetool/Join.java index 5815591..5a11ab8 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Join.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Join.java @@ -18,7 +18,7 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkState; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java b/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java index 84ce84b..8cf43f0 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ListSnapshots.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; import javax.management.openmbean.TabularData; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tools.NodeProbe; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Move.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Move.java b/src/java/org/apache/cassandra/tools/nodetool/Move.java index fc6b1bf..8654d25 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Move.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Move.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/NetStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java index 1b7a63b..2312097 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.Set; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java index ed1f655..4ec70d8 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/PauseHandoff.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java b/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java index 656e7ed..620d75a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ProxyHistograms.java @@ -18,7 +18,7 @@ package org.apache.cassandra.tools.nodetool; import static java.lang.String.format; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java b/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java index e079a4b..1ca2aa9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RangeKeySample.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java b/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java index b27e674..a083cde 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Rebuild.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java b/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java index 5fd7327..4a6b071 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RebuildIndex.java @@ -19,8 +19,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.toArray; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Refresh.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Refresh.java b/src/java/org/apache/cassandra/tools/nodetool/Refresh.java index 153255c..726f12a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Refresh.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Refresh.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java b/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java index 870c7b4..586b451 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RefreshSizeEstimates.java @@ -18,7 +18,7 @@ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java b/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java index 416aff0..6ca90fb 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReloadTriggers.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java b/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java index 7c3066c..853b1d3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RelocateSSTables.java @@ -20,9 +20,9 @@ package org.apache.cassandra.tools.nodetool; import java.util.ArrayList; import java.util.List; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java index 848049e..7312597 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Repair.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Repair.java b/src/java/org/apache/cassandra/tools/nodetool/Repair.java index 77ad214..86c29d4 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Repair.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Repair.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.collect.Lists.newArrayList; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.ArrayList; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java b/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java index bb201a2..0b4f767 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RepairAdmin.java @@ -26,8 +26,8 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.repair.consistent.LocalSessionInfo; import org.apache.cassandra.service.ActiveRepairServiceMBean; import org.apache.cassandra.tools.NodeProbe; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java b/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java index e3dcbd4..23c31f7 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ReplayBatchlog.java @@ -21,7 +21,7 @@ package org.apache.cassandra.tools.nodetool; import java.io.IOError; import java.io.IOException; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java b/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java index 43280ab..708636f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ResetLocalSchema.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java index 584ab64..a3984f8 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ResumeHandoff.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Ring.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Ring.java b/src/java/org/apache/cassandra/tools/nodetool/Ring.java index c6b9af1..9c389c2 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Ring.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Ring.java @@ -18,9 +18,9 @@ package org.apache.cassandra.tools.nodetool; import static java.lang.String.format; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.net.InetAddress; import java.net.UnknownHostException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Scrub.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java index 2345a85..9cc9fe6 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java b/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java index 6c280d8..461f6ae 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCacheCapacity.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java b/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java index 12a4570..18197e6 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCacheKeysToSave.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java index 304f2b7..56e558f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThreshold.java @@ -19,8 +19,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.Integer.parseInt; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java index 0111a20..80e7222 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetCompactionThroughput.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java index 56fafe1..5980e99 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetConcurrentCompactors.java @@ -19,8 +19,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java b/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java index d20ff3f..feb945b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetHintedHandoffThrottleInKB.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java index 41ce43a..e2e606c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetInterDCStreamThroughput.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java b/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java index d11d48f..94e4e3b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetLoggingLevel.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java b/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java index 0fb809a..ace1a49 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetMaxHintWindow.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java b/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java index 8055872..069a6e9 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetStreamThroughput.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java b/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java index 0b99efd..06b859b 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetTimeout.java @@ -17,8 +17,8 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java b/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java index ebef1a4..e081980 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java +++ b/src/java/org/apache/cassandra/tools/nodetool/SetTraceProbability.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java index 8941ec1..8d01d3a 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.collect.Iterables.toArray; import static org.apache.commons.lang3.StringUtils.join; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Status.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Status.java b/src/java/org/apache/cassandra/tools/nodetool/Status.java index f7bb1e5..f3ef606 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Status.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Status.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.net.InetAddress; import java.net.UnknownHostException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java b/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java index 49a6750..84fa8a5 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusBackup.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java b/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java index d4fae14..45fe6c3 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusBinary.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java b/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java index e40df8d..b6a1164 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusGossip.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java b/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java index 65f6729..bee161d 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StatusHandoff.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Stop.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Stop.java b/src/java/org/apache/cassandra/tools/nodetool/Stop.java index 6229e65..d529319 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Stop.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Stop.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.tools.NodeProbe; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java b/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java index 24c8920..6e453da 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.tools.NodeProbe; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java index 8f4ffa6..5286e18 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableHistograms.java @@ -19,8 +19,8 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.String.format; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/TableStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java index b67f7c4..ac23497 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java @@ -18,9 +18,9 @@ package org.apache.cassandra.tools.nodetool; import java.util.*; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java b/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java index 931ac62..73bf2fb 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TopPartitions.java @@ -19,9 +19,9 @@ package org.apache.cassandra.tools.nodetool; import static com.google.common.base.Preconditions.checkArgument; import static org.apache.commons.lang3.StringUtils.join; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.ArrayList; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/TpStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/TpStats.java b/src/java/org/apache/cassandra/tools/nodetool/TpStats.java index 0cf8e50..d7e8f06 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TpStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TpStats.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; -import io.airlift.command.Option; +import io.airlift.airline.Option; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; import org.apache.cassandra.tools.nodetool.stats.TpStatsHolder; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java b/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java index bcd554f..a3a0049 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TruncateHints.java @@ -18,8 +18,8 @@ package org.apache.cassandra.tools.nodetool; import static org.apache.commons.lang3.StringUtils.EMPTY; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java b/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java index 82866e0..c957c8c 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java +++ b/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Verify.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Verify.java b/src/java/org/apache/cassandra/tools/nodetool/Verify.java index c449366..75cb109 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Verify.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Verify.java @@ -17,9 +17,9 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/Version.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Version.java b/src/java/org/apache/cassandra/tools/nodetool/Version.java index 2495508..395a247 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Version.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Version.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.tools.nodetool; -import io.airlift.command.Command; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java b/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java index 0696396..b432b68 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java +++ b/src/java/org/apache/cassandra/tools/nodetool/ViewBuildStatus.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool; import org.apache.cassandra.tools.nodetool.formatter.TableBuilder; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f415b736/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java b/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java index 1b63b5a..867918a 100644 --- a/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java +++ b/tools/stress/src/org/apache/cassandra/stress/CompactionStress.java @@ -29,7 +29,7 @@ import javax.inject.Inject; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Uninterruptibles; -import io.airlift.command.*; +import io.airlift.airline.*; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.statements.CreateTableStatement; import org.apache.cassandra.db.ColumnFamilyStore; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
