Updated Branches: refs/heads/cassandra-1.2 2dc444851 -> 551da4cfa refs/heads/trunk 1cc0f1f30 -> ead7312cf
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/ead7312c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ead7312c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ead7312c Branch: refs/heads/trunk Commit: ead7312cf8baa249de74ad4f7ab0c6760c505fc3 Parents: 1cc0f1f 551da4c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jan 16 14:45:38 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jan 16 14:45:38 2013 -0600 ---------------------------------------------------------------------- .../locator/GossipingPropertyFileSnitch.java | 2 ++ .../cassandra/locator/PropertyFileSnitch.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
