Updated Branches: refs/heads/trunk 009a446b3 -> 7c77c8415
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/7c77c841 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c77c841 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c77c841 Branch: refs/heads/trunk Commit: 7c77c84150bb9103417f5836203546fd2644e736 Parents: 009a446 e90dcd5 Author: Vijay Parthasarathy <[email protected]> Authored: Mon Jan 14 21:04:52 2013 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Mon Jan 14 21:04:52 2013 -0800 ---------------------------------------------------------------------- conf/cassandra-rackdc.properties | 6 ++- .../org/apache/cassandra/locator/Ec2Snitch.java | 2 + .../locator/GossipingPropertyFileSnitch.java | 55 +++------------ .../apache/cassandra/locator/SnitchProperties.java | 54 ++++++++++++++ test/conf/cassandra-rackdc.properties | 24 ++++++ 5 files changed, 94 insertions(+), 47 deletions(-) ----------------------------------------------------------------------
