You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/09/13 00:46:16 UTC

[1/3] git commit: deprecate yaml snitch

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ddb1e168b -> d93a580d7
  refs/heads/trunk a002a0ed2 -> 793630a95


deprecate yaml snitch


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d93a580d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d93a580d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d93a580d

Branch: refs/heads/cassandra-2.1
Commit: d93a580d73f733b5b40e768c5c838a219b552bde
Parents: ddb1e16
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 17:46:05 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 17:46:05 2014 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d93a580d/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 3237979..93e76f0 100644
--- a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
+++ b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
@@ -102,6 +102,7 @@ public class YamlFileNetworkTopologySnitch
     YamlFileNetworkTopologySnitch(final String topologyConfigFilename)
             throws ConfigurationException
     {
+        logger.warn("YamlFileNetworkTopologySnitch is deprecated; switch to GossipingPropertyFileSnitch instead");
         this.topologyConfigFilename = topologyConfigFilename;
         loadTopologyConfiguration();

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by br...@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/793630a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/793630a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/793630a9

Branch: refs/heads/trunk
Commit: 793630a950fce4da5190222fa3bfe1d13237c1c6
Parents: a002a0e d93a580
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 17:46:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 17:46:10 2014 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------

[2/3] git commit: deprecate yaml snitch

Posted by br...@apache.org.
deprecate yaml snitch


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d93a580d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d93a580d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d93a580d

Branch: refs/heads/trunk
Commit: d93a580d73f733b5b40e768c5c838a219b552bde
Parents: ddb1e16
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 17:46:05 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 17:46:05 2014 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d93a580d/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 3237979..93e76f0 100644
--- a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
+++ b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
@@ -102,6 +102,7 @@ public class YamlFileNetworkTopologySnitch
     YamlFileNetworkTopologySnitch(final String topologyConfigFilename)
             throws ConfigurationException
     {
+        logger.warn("YamlFileNetworkTopologySnitch is deprecated; switch to GossipingPropertyFileSnitch instead");
         this.topologyConfigFilename = topologyConfigFilename;
         loadTopologyConfiguration();