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 <[email protected]> Authored: Fri Sep 12 17:46:10 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Sep 12 17:46:10 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
