Updated Branches: refs/heads/cassandra-1.2 3925f5606 -> 694e3a74a refs/heads/trunk 7242a0054 -> 5673ab3b6
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5673ab3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5673ab3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5673ab3b Branch: refs/heads/trunk Commit: 5673ab3b618ca4c2fb0c739ad4cd48d6d7d757d5 Parents: 7242a00 694e3a7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Feb 14 11:17:55 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Feb 14 11:17:55 2013 -0600 ---------------------------------------------------------------------- .../cassandra/locator/DynamicEndpointSnitch.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
