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/ddb1e168 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddb1e168 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddb1e168 Branch: refs/heads/trunk Commit: ddb1e168b16a73d411faa2a79b826ebfbfe51fc8 Parents: 23b957c cb14792 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Sep 12 14:43:04 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Sep 12 14:43:04 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
