You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2013/06/21 20:39:13 UTC
git commit: ninja-remove an assert that is not really relevent (and
now causing errors due to refactor in CASSANDRA-5665)
Updated Branches:
refs/heads/cassandra-1.2 362473fb3 -> 043a63c63
ninja-remove an assert that is not really relevent (and now causing errors
due to refactor in CASSANDRA-5665)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/043a63c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/043a63c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/043a63c6
Branch: refs/heads/cassandra-1.2
Commit: 043a63c63b92b0bf68047da6b5e379da35f3c688
Parents: 362473f
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Jun 21 11:37:22 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Jun 21 11:39:02 2013 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/043a63c6/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 6b0bbe9..b629824 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -918,7 +918,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
ApplicationState key = fromEntry.getKey();
VersionedValue value = fromEntry.getValue();
- assert fromState.getHeartBeatState().getGeneration() == toState.getHeartBeatState().getGeneration();
if ( (toState.applicationState.containsKey(key) && toState.applicationState.get(key).compareTo(value) < 0)
|| !toState.applicationState.containsKey(key) )