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/05/02 23:43:53 UTC
[01/10] git commit: fix build
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 562a22fcd -> 837bded79
refs/heads/cassandra-2.0 238a02084 -> 2658c90e6
refs/heads/cassandra-2.1 8939ac492 -> baee086f6
refs/heads/trunk 46539e196 -> 909fd5bc9
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/837bded7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/837bded7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/837bded7
Branch: refs/heads/cassandra-1.2
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// set state back to normal, since the node may have tried to leave, but failed and is now back up
tokensToUpdateInMetadata.add(token);
if (!isClientMode)
- tokensToUpdateInSystemKeyspace.add(token);
+ tokensToUpdateInSystemTable.add(token);
}
else if (tokenMetadata.isRelocating(token) && tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
{
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2658c90e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2658c90e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2658c90e
Branch: refs/heads/trunk
Commit: 2658c90e67bd5e933dde18c8404662fd99b9e105
Parents: 238a020 837bded
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:45 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:45 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2658c90e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2658c90e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2658c90e
Branch: refs/heads/cassandra-2.0
Commit: 2658c90e67bd5e933dde18c8404662fd99b9e105
Parents: 238a020 837bded
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:45 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:45 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/10] git commit: fix build
Posted by br...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/837bded7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/837bded7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/837bded7
Branch: refs/heads/trunk
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// set state back to normal, since the node may have tried to leave, but failed and is now back up
tokensToUpdateInMetadata.add(token);
if (!isClientMode)
- tokensToUpdateInSystemKeyspace.add(token);
+ tokensToUpdateInSystemTable.add(token);
}
else if (tokenMetadata.isRelocating(token) && tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
{
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/baee086f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baee086f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baee086f
Branch: refs/heads/trunk
Commit: baee086f6d2db36d127ea73677c7996209792a03
Parents: 8939ac4 2658c90
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:55 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/baee086f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baee086f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baee086f
Branch: refs/heads/cassandra-2.1
Commit: baee086f6d2db36d127ea73677c7996209792a03
Parents: 8939ac4 2658c90
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:55 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/10] git commit: fix build
Posted by br...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/837bded7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/837bded7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/837bded7
Branch: refs/heads/cassandra-2.1
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// set state back to normal, since the node may have tried to leave, but failed and is now back up
tokensToUpdateInMetadata.add(token);
if (!isClientMode)
- tokensToUpdateInSystemKeyspace.add(token);
+ tokensToUpdateInSystemTable.add(token);
}
else if (tokenMetadata.isRelocating(token) && tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
{
[02/10] git commit: fix build
Posted by br...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/837bded7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/837bded7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/837bded7
Branch: refs/heads/cassandra-2.0
Commit: 837bded794f23975414eb81a73a7120aaabc13ea
Parents: 562a22f
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:36 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:36 2014 -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/837bded7/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 992a13a..bfca642 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1537,7 +1537,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// set state back to normal, since the node may have tried to leave, but failed and is now back up
tokensToUpdateInMetadata.add(token);
if (!isClientMode)
- tokensToUpdateInSystemKeyspace.add(token);
+ tokensToUpdateInSystemTable.add(token);
}
else if (tokenMetadata.isRelocating(token) && tokenMetadata.getRelocatingRanges().get(token).equals(endpoint))
{
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2658c90e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2658c90e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2658c90e
Branch: refs/heads/cassandra-2.1
Commit: 2658c90e67bd5e933dde18c8404662fd99b9e105
Parents: 238a020 837bded
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:39:45 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:39:45 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/10] 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/909fd5bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/909fd5bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/909fd5bc
Branch: refs/heads/trunk
Commit: 909fd5bc929d6558167661ee7c9acd49f7ddce22
Parents: 46539e1 baee086
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 2 16:40:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 2 16:40:04 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------