You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2020/02/05 10:37:40 UTC
[cassandra] branch cassandra-3.11 updated (e4ca96a -> b33a11c)
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from e4ca96a Merge branch 'cassandra-3.0' into cassandra-3.11
new 75d14b6 Add a test for a "real" nodetool command, not only "help"
new 09fd7e8 Merge branch 'cassandra-2.2' into cassandra-3.0
new 7707e26 Merge branch 'cassandra-3.0' into cassandra-3.11
new b33a11c Make sure that the passed node probe factory is used in nodetool, like in other branches.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
.../org/apache/cassandra/distributed/test/NodeToolTest.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/02: Make sure that the passed node probe factory is
used in nodetool, like in other branches.
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b33a11ca4219b2317d35e48e1fb6f8a76b697e3e
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Tue Feb 4 17:33:11 2020 +0100
Make sure that the passed node probe factory is used in nodetool, like in other branches.
Patch by Alex Petrov; reviewed by Yifan Cai for CASSANDRA-15429
---
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index c28ec09..9b47eca 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -338,9 +338,9 @@ public class NodeTool
try
{
if (username.isEmpty())
- nodeClient = new NodeProbe(host, parseInt(port));
+ nodeClient = nodeProbeFactory.create(host, parseInt(port));
else
- nodeClient = new NodeProbe(host, parseInt(port), username, password);
+ nodeClient = nodeProbeFactory.create(host, parseInt(port), username, password);
} catch (IOException | SecurityException e)
{
Throwable rootCause = Throwables.getRootCause(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/02: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7707e261c523a68b04450f97793f7414f3accae5
Merge: e4ca96a 09fd7e8
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Wed Feb 5 11:32:58 2020 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
test/distributed/org/apache/cassandra/distributed/test/NodeToolTest.java | 1 +
1 file changed, 1 insertion(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org