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 2014/06/10 03:43:30 UTC
[1/4] git commit: simplify: prefer containsKey(x) to
keySet().contains(x)
Repository: cassandra
Updated Branches:
refs/heads/trunk a28f64f91 -> 204442452
simplify: prefer containsKey(x) to keySet().contains(x)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f40ddba4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f40ddba4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f40ddba4
Branch: refs/heads/trunk
Commit: f40ddba4779551344b8ec982c549ae082edcb5f3
Parents: 19a2077
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 9 21:40:45 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 9 21:40:45 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f40ddba4/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 caadb3e..a2addd1 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -194,7 +194,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
return true;
try
{
- if (entry.getValue().getApplicationStateMap().keySet().contains(ApplicationState.INTERNAL_IP) && seeds.contains(InetAddress.getByName(entry.getValue().getApplicationState(ApplicationState.INTERNAL_IP).value)))
+ if (entry.getValue().getApplicationStateMap().containsKey(ApplicationState.INTERNAL_IP) && seeds.contains(InetAddress.getByName(entry.getValue().getApplicationState(ApplicationState.INTERNAL_IP).value)))
return true;
}
catch (UnknownHostException e)
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@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/deaf5ba1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/deaf5ba1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/deaf5ba1
Branch: refs/heads/trunk
Commit: deaf5ba157d99161369a298c8fe9bc2289702f5e
Parents: b16c6b9 3e5f2bd
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 9 21:41:59 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 9 21:41:59 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/deaf5ba1/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@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/3e5f2bd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e5f2bd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e5f2bd6
Branch: refs/heads/trunk
Commit: 3e5f2bd64eb094c9a69eb99c73318629e5102bb6
Parents: bb58d80 f40ddba
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 9 21:41:29 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 9 21:41:29 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e5f2bd6/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@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/20444245
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20444245
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20444245
Branch: refs/heads/trunk
Commit: 2044424524a9cba47e58ba81feab6df5d17ac995
Parents: a28f64f deaf5ba
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 9 21:42:36 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 9 21:42:36 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20444245/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------