Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f57f1c07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f57f1c07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f57f1c07 Branch: refs/heads/cassandra-1.1 Commit: f57f1c07c21bdd27ca7c8f41a880602872a0658b Parents: 389e6cd 483a699 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Apr 13 10:35:33 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Apr 13 10:35:33 2012 -0500 ---------------------------------------------------------------------- .rat-excludes | 1 + CHANGES.txt | 8 +------- build.xml | 2 +- debian/changelog | 6 ++++++ .../cassandra/locator/PropertyFileSnitch.java | 3 ++- 5 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f57f1c07/CHANGES.txt ----------------------------------------------------------------------
