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/08/05 21:22:38 UTC
[1/3] git commit: Revert "fix build, remove dead method again"
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f75988150 -> bd191f18e
refs/heads/trunk 8625661d5 -> 25041771f
Revert "fix build, remove dead method again"
This reverts commit f7598815059bad05b6c6a4af53c8f5f5c8800a04.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd191f18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd191f18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd191f18
Branch: refs/heads/cassandra-2.1
Commit: bd191f18e0317df1040567d5de9a3744dfc32aba
Parents: f759881
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 14:20:03 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 14:20:03 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd191f18/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
}
@Override
+ public void onSuspected(Host host)
+ {
+ }
+
+ @Override
public HostDistance distance(Host host)
{
if (host.getAddress().getHostName().equals(stickHost))
[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/25041771
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25041771
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25041771
Branch: refs/heads/trunk
Commit: 25041771f74ad842aee66f79f0d3c09cdadb0872
Parents: 8625661 bd191f1
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 14:22:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 14:22:20 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
[2/3] git commit: Revert "fix build, remove dead method again"
Posted by br...@apache.org.
Revert "fix build, remove dead method again"
This reverts commit f7598815059bad05b6c6a4af53c8f5f5c8800a04.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd191f18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd191f18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd191f18
Branch: refs/heads/trunk
Commit: bd191f18e0317df1040567d5de9a3744dfc32aba
Parents: f759881
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 14:20:03 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 14:20:03 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd191f18/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
}
@Override
+ public void onSuspected(Host host)
+ {
+ }
+
+ @Override
public HostDistance distance(Host host)
{
if (host.getAddress().getHostName().equals(stickHost))