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/d697ba6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d697ba6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d697ba6f Branch: refs/heads/trunk Commit: d697ba6f5646baa4f3ed959fd1d356ba3fb253ee Parents: 8aea161 85f67aa Author: Brandon Williams <[email protected]> Authored: Tue Feb 25 10:42:20 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Feb 25 10:42:20 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../locator/DynamicEndpointSnitch.java | 25 +++-- .../locator/DynamicEndpointSnitchTest.java | 108 ++++++++----------- 3 files changed, 61 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d697ba6f/CHANGES.txt ----------------------------------------------------------------------
