Updated Branches: refs/heads/trunk a17f0ed4e -> a562636e5
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/a562636e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a562636e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a562636e Branch: refs/heads/trunk Commit: a562636e5d9de8c41a1d6d521c39ef010f90c409 Parents: a17f0ed 7093813 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Mar 1 17:05:57 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Mar 1 17:05:57 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/locator/PropertyFileSnitch.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a562636e/CHANGES.txt ----------------------------------------------------------------------
