You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/26 21:40:12 UTC
[2/3] git commit: fix merge
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/trunk
Commit: f15681b6795d8a0b192100e37bec4080db2b7edb
Parents: ab4cc9c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Nov 26 14:39:21 2013 -0600
Committer: Jonathan Ellis <jb...@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())