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/a002a0ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a002a0ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a002a0ed Branch: refs/heads/trunk Commit: a002a0ed26771a3c80db2d7bae64fbf9e3aa1f12 Parents: 7b495e2 ddb1e16 Author: Brandon Williams <[email protected]> Authored: Fri Sep 12 14:43:14 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Sep 12 14:43:14 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
