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/03/09 03:22:05 UTC
[1/2] git commit: avoid reinitiating gossip when nothings changed
Repository: cassandra
Updated Branches:
refs/heads/trunk 17adc5963 -> b730e5f26
avoid reinitiating gossip when nothings changed
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89bccb6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89bccb6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89bccb6f
Branch: refs/heads/trunk
Commit: 89bccb6f7b34667668db6a41f34fa24c94faf0d2
Parents: 893c11f
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Mar 8 21:20:35 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Mar 8 21:20:35 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/locator/GossipingPropertyFileSnitch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89bccb6f/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
index 720e804..2c0980a 100644
--- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
@@ -174,7 +174,7 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch//
newRack = newRack.trim();
final boolean newPreferLocal = Boolean.parseBoolean(properties.get("prefer_local", "false"));
- if (myDC != newDc || myRack != newRack || (preferLocal != newPreferLocal))
+ if (!newDc.equals(myDC) || !newRack.equals(myRack) || (preferLocal != newPreferLocal))
{
myDC = newDc;
myRack = newRack;
[2/2] 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/b730e5f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b730e5f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b730e5f2
Branch: refs/heads/trunk
Commit: b730e5f26d33a2e72054d3450ad451292fcb21ec
Parents: 17adc59 89bccb6
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Mar 8 21:21:22 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Mar 8 21:21:22 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/locator/GossipingPropertyFileSnitch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------