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/07/17 23:00:27 UTC
[1/7] git commit: fix setlogginglevel help in nodetool
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5dfee585d -> e5625fcad
refs/heads/trunk db70f5a3f -> ddc0f66d9
fix setlogginglevel help in nodetool
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43c2c169
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43c2c169
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43c2c169
Branch: refs/heads/cassandra-2.1
Commit: 43c2c169b7bd8f6d5ec16557532c34f3ebcc995a
Parents: 5de9c17
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 15:59:05 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 15:59:05 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/43c2c169/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 20f2032..3ec0df3 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2299,10 +2299,10 @@ public class NodeTool
}
}
- @Command(name = "setlogginglevel", description = "Set a log level for a given logger. If both classQualifer and level are empty/null, it will reset based on the initial configuration")
+ @Command(name = "setlogginglevel", description = "Set the log level threshold for a given class. If both class and level are empty/null, it will reset to the initial configuration")
public static class SetLoggingLevel extends NodeToolCmd
{
- @Arguments(usage = "<classQualifer> <level>", description = "The logger classQualifer and the logger level (can be empty)")
+ @Arguments(usage = "<class> <level>", description = "The class to change the level for and the log level threshold to set (can be empty)")
private List<String> args = new ArrayList<>();
@Override
[3/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a1edabd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a1edabd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a1edabd
Branch: refs/heads/trunk
Commit: 7a1edabd927e960ce4b2add88cc2ade2ba45d08e
Parents: f873a32 43c2c16
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 15:59:13 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 15:59:13 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[6/7] git commit: Merge branch 'cassandra-2.1'
Posted by br...@apache.org.
Merge branch 'cassandra-2.1'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5625fca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5625fca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5625fca
Branch: refs/heads/cassandra-2.1
Commit: e5625fcad96fa9decef927937e70c2ec39dc96d7
Parents: 7a1edab 5dfee58
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 15:59:49 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 15:59:49 2014 -0500
----------------------------------------------------------------------
bin/cqlsh | 46 +++++++++++++++++++++++++++++++++-------------
build.xml | 12 ++++++++----
2 files changed, 41 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[7/7] git commit: Merge branch 'trunk'
Posted by br...@apache.org.
Merge branch 'trunk'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddc0f66d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddc0f66d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddc0f66d
Branch: refs/heads/trunk
Commit: ddc0f66d97afc263918f70601b77d82301679e36
Parents: 4831bf4 db70f5a
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 16:00:12 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 16:00:12 2014 -0500
----------------------------------------------------------------------
bin/cqlsh | 46 +++++++++++++++++++++++++++++++++-------------
1 file changed, 33 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[4/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a1edabd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a1edabd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a1edabd
Branch: refs/heads/cassandra-2.1
Commit: 7a1edabd927e960ce4b2add88cc2ade2ba45d08e
Parents: f873a32 43c2c16
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 15:59:13 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 15:59:13 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/7] git commit: fix setlogginglevel help in nodetool
Posted by br...@apache.org.
fix setlogginglevel help in nodetool
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43c2c169
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43c2c169
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43c2c169
Branch: refs/heads/trunk
Commit: 43c2c169b7bd8f6d5ec16557532c34f3ebcc995a
Parents: 5de9c17
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 15:59:05 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 15:59:05 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/43c2c169/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 20f2032..3ec0df3 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2299,10 +2299,10 @@ public class NodeTool
}
}
- @Command(name = "setlogginglevel", description = "Set a log level for a given logger. If both classQualifer and level are empty/null, it will reset based on the initial configuration")
+ @Command(name = "setlogginglevel", description = "Set the log level threshold for a given class. If both class and level are empty/null, it will reset to the initial configuration")
public static class SetLoggingLevel extends NodeToolCmd
{
- @Arguments(usage = "<classQualifer> <level>", description = "The logger classQualifer and the logger level (can be empty)")
+ @Arguments(usage = "<class> <level>", description = "The class to change the level for and the log level threshold to set (can be empty)")
private List<String> args = new ArrayList<>();
@Override
[5/7] 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/4831bf41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4831bf41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4831bf41
Branch: refs/heads/trunk
Commit: 4831bf41e011c419328a9dd7d7809512e819983a
Parents: c996a36 7a1edab
Author: Brandon Williams <br...@datastax.com>
Authored: Thu Jul 17 15:59:21 2014 -0500
Committer: Brandon Williams <br...@datastax.com>
Committed: Thu Jul 17 15:59:21 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/4831bf41/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------