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/93c9fb82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93c9fb82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93c9fb82 Branch: refs/heads/trunk Commit: 93c9fb82ceb83fc134a7574b6fe7cd22da6e5c6c Parents: 66dcdd9 b374fd5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jul 11 23:51:14 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jul 11 23:51:14 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/93c9fb82/CHANGES.txt ----------------------------------------------------------------------
