Updated Branches: refs/heads/cassandra-1.2 526711288 -> 2354d62e3 refs/heads/trunk 4f2f97944 -> f02bdfeab
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/f02bdfea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f02bdfea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f02bdfea Branch: refs/heads/trunk Commit: f02bdfeab073e7f1bef955aaa9659d2cce780579 Parents: 4f2f979 2354d62 Author: Brandon Williams <[email protected]> Authored: Wed Jan 16 12:29:02 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Jan 16 12:29:02 2013 -0600 ---------------------------------------------------------------------- .../locator/GossipingPropertyFileSnitch.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
