Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb354fb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb354fb4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb354fb4 Branch: refs/heads/trunk Commit: eb354fb4b1d468983d861b548259a2e116cd3a4a Parents: 4910ce8 200e494 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jan 14 15:16:14 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jan 14 15:16:14 2014 -0600 ---------------------------------------------------------------------- .../cassandra/locator/DynamicEndpointSnitch.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) ----------------------------------------------------------------------