You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/10/24 05:50:53 UTC
[1/2] git commit: use long math for long values
Updated Branches:
refs/heads/trunk 460fc03ee -> dfabeb52d
use long math for long values
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2b224a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2b224a4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2b224a4
Branch: refs/heads/trunk
Commit: a2b224a45975286ce4db5133d3a8f4b19e05ec63
Parents: 3cf18d7
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Oct 23 23:49:45 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Oct 23 23:49:45 2013 -0400
----------------------------------------------------------------------
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/a2b224a4/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 f9126c7..5b4a176 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -709,7 +709,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
InetAddress existing = tokenMetadata.getEndpoint(token);
if (existing != null)
{
- long nanoDelay = delay * 1000000;
+ long nanoDelay = delay * 1000000L;
if (Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp() > (System.nanoTime() - nanoDelay))
throw new UnsupportedOperationException("Cannnot replace a live node... ");
current.add(existing);
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by db...@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/dfabeb52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfabeb52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfabeb52
Branch: refs/heads/trunk
Commit: dfabeb52d4233837bdbd0b68875ddcfa9f472634
Parents: 460fc03 a2b224a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Oct 23 23:50:29 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Oct 23 23:50:29 2013 -0400
----------------------------------------------------------------------
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/dfabeb52/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------