Updated Branches: refs/heads/cassandra-1.1 cbf043618 -> cf9a581bf refs/heads/trunk 5ab69b62c -> 782b1561f
Merge branch 'cassandra-1.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/782b1561 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/782b1561 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/782b1561 Branch: refs/heads/trunk Commit: 782b1561fad6b7339e62161232d2a0e421cd6f22 Parents: 5ab69b6 cf9a581 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri May 25 15:22:08 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri May 25 15:22:08 2012 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 + .../locator/GossipingPropertyFileSnitch.java | 140 +++++++++++++++ .../cassandra/locator/PropertyFileSnitch.java | 4 +- 3 files changed, 147 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/782b1561/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java ----------------------------------------------------------------------
