cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: fix merge
Date Tue, 26 Nov 2013 20:40:11 GMT
Updated Branches:
  refs/heads/cassandra-2.0 ab4cc9c00 -> f15681b67
  refs/heads/trunk a13c6dcbb -> f15d6d591


fix merge


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f15681b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f15681b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f15681b6

Branch: refs/heads/cassandra-2.0
Commit: f15681b6795d8a0b192100e37bec4080db2b7edb
Parents: ab4cc9c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Nov 26 14:39:21 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Nov 26 14:39:21 2013 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f15681b6/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 47e91c9..635c010 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -976,7 +976,7 @@ public class TokenMetadata
         return sb.toString();
     }
 
-    public Collection<InetAddress> pendingEndpointsFor(Token token, String table)
+    public Collection<InetAddress> pendingEndpointsFor(Token token, String keyspaceName)
     {
         Map<Range<Token>, Collection<InetAddress>> ranges = getPendingRanges(keyspaceName);
         if (ranges.isEmpty())


Mime
View raw message