Updated Branches: refs/heads/trunk d52e12a86 -> af0a5687e
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/af0a5687 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af0a5687 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af0a5687 Branch: refs/heads/trunk Commit: af0a5687e043014b83dffb228564c73d910ed8e5 Parents: d52e12a fa1f9ba Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Fri Feb 1 12:36:18 2013 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Fri Feb 1 12:36:18 2013 -0800 ---------------------------------------------------------------------- debian/cassandra.install | 1 + .../locator/GossipingPropertyFileSnitch.java | 2 +- .../apache/cassandra/locator/SnitchProperties.java | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
