Updated Branches: refs/heads/trunk 7fcdd8080 -> 2feb81ead
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/trunk Commit: 043a63c63b92b0bf68047da6b5e379da35f3c688 Parents: 362473f Author: Jason Brown <[email protected]> Authored: Fri Jun 21 11:37:22 2013 -0700 Committer: Jason Brown <[email protected]> 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) )
