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 2013/10/18 18:17:46 UTC
[1/3] git commit: fix merge again
Updated Branches:
refs/heads/cassandra-2.0 ff5db5635 -> 99bef9dfe
refs/heads/trunk 8e0aa710d -> 50b08f2b2
fix merge again
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99bef9df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99bef9df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99bef9df
Branch: refs/heads/cassandra-2.0
Commit: 99bef9dfe8bbf83526b5a3686a7eb1aaf7cb9b94
Parents: ff5db56
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 18 11:15:57 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 18 11:15:57 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/99bef9df/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index e6b11a4..4065c9e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -932,7 +932,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
// Dont set any state for the node which is bootstrapping the existing token...
tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress());
- SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
+ SystemKeyspace.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
}
if (!Gossiper.instance.seenAnySeed())
throw new IllegalStateException("Unable to contact any seeds!");
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50b08f2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50b08f2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50b08f2b
Branch: refs/heads/trunk
Commit: 50b08f2b27f4c7009ec04b1ed7bee5491ced63c5
Parents: 8e0aa71 99bef9d
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 18 11:16:03 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 18 11:16:03 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b08f2b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/3] git commit: fix merge again
Posted by br...@apache.org.
fix merge again
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99bef9df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99bef9df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99bef9df
Branch: refs/heads/trunk
Commit: 99bef9dfe8bbf83526b5a3686a7eb1aaf7cb9b94
Parents: ff5db56
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 18 11:15:57 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 18 11:15:57 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/99bef9df/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index e6b11a4..4065c9e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -932,7 +932,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
// Dont set any state for the node which is bootstrapping the existing token...
tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress());
- SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
+ SystemKeyspace.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
}
if (!Gossiper.instance.seenAnySeed())
throw new IllegalStateException("Unable to contact any seeds!");