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/f0d4705e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0d4705e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0d4705e Branch: refs/heads/trunk Commit: f0d4705e6fd90e865cd9f88d5159e1049a772220 Parents: 4040ba8 c6e4379 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Apr 17 18:43:36 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Apr 17 18:43:36 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/ReconnectableSnitchHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
