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/ee64bf73 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee64bf73 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee64bf73 Branch: refs/heads/trunk Commit: ee64bf737cfcef19428088aca8595fe6cf52a93b Parents: 08d5f26 3089c92 Author: Jonathan Ellis <[email protected]> Authored: Fri May 2 13:57:19 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri May 2 13:57:19 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/locator/SnitchProperties.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
