You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/22 17:28:31 UTC
[1/3] git commit: don't mention unneeded token escaping
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 c531f537f -> c320cb340
refs/heads/trunk b7a1eb4ce -> 8bc7ab18d
don't mention unneeded token escaping
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c320cb34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c320cb34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c320cb34
Branch: refs/heads/cassandra-2.1
Commit: c320cb34019710895a3570d001c73688fa948c2b
Parents: c531f53
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 10:24:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 10:24:37 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c320cb34/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 2c8d0c2..264a8bf 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1401,7 +1401,7 @@ public class NodeTool
}
}
- @Command(name = "taketoken", description = "Move the token(s) from the existing owner(s) to this node. For vnodes only. Use \\\\ to escape negative tokens.")
+ @Command(name = "taketoken", description = "Move the token(s) from the existing owner(s) to this node. For vnodes only.")
public static class TakeToken extends NodeToolCmd
{
@Arguments(usage = "<token, ...>", description = "Token(s) to take", required = true)
@@ -1442,7 +1442,7 @@ public class NodeTool
@Command(name = "move", description = "Move node on the token ring to a new token")
public static class Move extends NodeToolCmd
{
- @Arguments(usage = "<new token>", description = "The new token. (for negative tokens)", required = true)
+ @Arguments(usage = "<new token>", description = "The new token.", required = true)
private String newToken = EMPTY;
@Override
[2/3] git commit: don't mention unneeded token escaping
Posted by br...@apache.org.
don't mention unneeded token escaping
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c320cb34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c320cb34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c320cb34
Branch: refs/heads/trunk
Commit: c320cb34019710895a3570d001c73688fa948c2b
Parents: c531f53
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 10:24:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 10:24:37 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c320cb34/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 2c8d0c2..264a8bf 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1401,7 +1401,7 @@ public class NodeTool
}
}
- @Command(name = "taketoken", description = "Move the token(s) from the existing owner(s) to this node. For vnodes only. Use \\\\ to escape negative tokens.")
+ @Command(name = "taketoken", description = "Move the token(s) from the existing owner(s) to this node. For vnodes only.")
public static class TakeToken extends NodeToolCmd
{
@Arguments(usage = "<token, ...>", description = "Token(s) to take", required = true)
@@ -1442,7 +1442,7 @@ public class NodeTool
@Command(name = "move", description = "Move node on the token ring to a new token")
public static class Move extends NodeToolCmd
{
- @Arguments(usage = "<new token>", description = "The new token. (for negative tokens)", required = true)
+ @Arguments(usage = "<new token>", description = "The new token.", required = true)
private String newToken = EMPTY;
@Override
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bc7ab18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bc7ab18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bc7ab18
Branch: refs/heads/trunk
Commit: 8bc7ab18db383c9d3224d19c2497c9f4885b4cbd
Parents: b7a1eb4 c320cb3
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 10:24:44 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 10:24:44 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------