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/05/03 22:56:14 UTC
[1/3] git commit: fix node's broadcast address sanity check
Repository: cassandra
Updated Branches:
refs/heads/trunk 848494d5f -> aca945d79
fix node's broadcast address sanity check
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65cd825d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65cd825d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65cd825d
Branch: refs/heads/trunk
Commit: 65cd825d0d423b7473b7197b2d22a3dc169e2bb1
Parents: 3fb2dcd
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 3 16:51:14 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 3 16:51:14 2014 -0400
----------------------------------------------------------------------
.../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65cd825d/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
index f299b61..99ab792 100644
--- a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
+++ b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
@@ -273,7 +273,7 @@ public class YamlFileNetworkTopologySnitch
for (final Node node : rack.nodes)
{
- if (rack.rack_name == null)
+ if (node.broadcast_address == null)
{
throw new ConfigurationException(
String.format(
[2/3] 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/f12a8a32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f12a8a32
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f12a8a32
Branch: refs/heads/trunk
Commit: f12a8a32e4ae72959b01931289231395d8949fc7
Parents: 38a48b1 65cd825
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 3 16:54:36 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 3 16:54:36 2014 -0400
----------------------------------------------------------------------
.../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] 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/aca945d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aca945d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aca945d7
Branch: refs/heads/trunk
Commit: aca945d79c0a42e96d807f04f713f5e490c101c1
Parents: 848494d f12a8a3
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 3 16:55:03 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 3 16:55:03 2014 -0400
----------------------------------------------------------------------
.../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------