Merge branch 'cassandra-2.1.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/b374fd59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b374fd59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b374fd59 Branch: refs/heads/cassandra-2.1 Commit: b374fd5930125dd9fe987f5483967e9f519ed328 Parents: 5e4b8f5 83ac8a6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jul 11 23:51:06 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jul 11 23:51:06 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b374fd59/CHANGES.txt ----------------------------------------------------------------------