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 2014/10/15 00:00:06 UTC
[1/2] git commit: ninja-remove unneeded continue statement
Repository: cassandra
Updated Branches:
refs/heads/trunk 18549038a -> 18886e128
ninja-remove unneeded continue statement
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5555311d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5555311d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5555311d
Branch: refs/heads/trunk
Commit: 5555311d182c24f830924501fde6474438e82b41
Parents: 8be8a08
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Oct 14 14:58:54 2014 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Oct 14 14:58:54 2014 -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/5555311d/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 ae8bf32..5f0e576 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -991,7 +991,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
// assume some peer has corrupted memory and is broadcasting an unbelievable generation about another peer (or itself)
logger.warn("received an invalid gossip generation for peer {}; local generation = {}, received generation = {}", ep, localGeneration, remoteGeneration);
- continue;
}
else if (remoteGeneration > localGeneration)
{
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@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/18886e12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18886e12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18886e12
Branch: refs/heads/trunk
Commit: 18886e128bfb1e85456dee61f64378fe5a9ff3d1
Parents: 1854903 5555311
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Oct 14 14:59:52 2014 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Oct 14 14:59:52 2014 -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/18886e12/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------